StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1402 from dbungert/terminology 

fix some easier cases of impolite language
This commit is contained in:
Dan Bungert 2022-08-29 18:00:35 -06:00 committed by GitHub
parent 1cbcbb7e3c d73772258d
commit 943ea53fbc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
console_conf/controllers/tests/test_chooser.py
View File

@ -140,7 +140,7 @@ class TestChooserController(unittest.TestCase):
def test_current_current_all_there_and_back(self, cv, ccsv):
app = make_app(model=make_model())
c = RecoveryChooserController(app)
# sanity
# confidence check
ccsv.assert_called_with(c, c.model.current, has_more=True)
cv.assert_called_with(c, c.model.systems)
@ -183,7 +183,7 @@ class TestChooserController(unittest.TestCase):
app = make_app(model=model)
c = RecoveryChooserController(app)
# sanity
# confidence check
self.assertIsNone(c.model.current)
# we get the all-systems view now

4
subiquity/client/client.py
View File

@ -36,7 +36,7 @@ from subiquitycore.view import BaseView
from subiquity.client.controller import Confirm
from subiquity.client.keycodes import (
DummyKeycodesFilter,
NoOpKeycodesFilter,
KeyCodesFilter,
)
from subiquity.common.api.client import make_client_for_conn
@ -125,7 +125,7 @@ class SubiquityClient(TuiApplication):
if is_linux_tty():
self.input_filter = KeyCodesFilter()
else:
self.input_filter = DummyKeycodesFilter()
self.input_filter = NoOpKeycodesFilter()
self.help_menu = HelpMenu(self, about_msg)
super().__init__(opts)

4
subiquity/client/keycodes.py
View File

@ -94,8 +94,8 @@ class KeyCodesFilter:
return keys
class DummyKeycodesFilter:
# A dummy implementation of the same interface as KeyCodesFilter
class NoOpKeycodesFilter:
# A do-nothing implementation of the same interface as KeyCodesFilter
# we can use when not running in a linux tty.
def enter_keycodes_mode(self):

2
subiquity/models/tests/test_subiquity.py
View File

@ -209,7 +209,7 @@ class TestSubiquityModel(unittest.IsolatedAsyncioTestCase):
def test_cloud_init_user_list_merge(self, run_cmd):
main_user = IdentityData(
username='mainuser',
crypted_password='dummy_value',
crypted_password='sample_value',
hostname='somehost')
secondary_user = {'name': 'user2'}

12
subiquity/server/tests/test_controller.py
View File

@ -38,21 +38,21 @@ class TestController(SubiTestCase):
# Make sure the autoinstall_key has precedence over
# autoinstall_key_alias if both are present.
self.controller.app.autoinstall_config = {
"dummy": "some-dummy-data",
"dummy-alias": "some-dummy-alias-data",
"sample": "some-sample-data",
"sample-alias": "some-sample-alias-data",
}
self.controller.autoinstall_key = "dummy"
self.controller.autoinstall_key_alias = "dummy-alias"
self.controller.autoinstall_key = "sample"
self.controller.autoinstall_key_alias = "sample-alias"
self.controller.autoinstall_default = "default-data"
self.controller.setup_autoinstall()
mock_load.assert_called_once_with("some-dummy-data")
mock_load.assert_called_once_with("some-sample-data")
# Make sure we failover to autoinstall_key_alias if autoinstall_key is
# not present
mock_load.reset_mock()
self.controller.autoinstall_key = "inexistent"
self.controller.setup_autoinstall()
mock_load.assert_called_once_with("some-dummy-alias-data")
mock_load.assert_called_once_with("some-sample-alias-data")
# Make sure we failover to autoinstall_default otherwise
mock_load.reset_mock()

2
subiquity/server/tests/test_runner.py
View File

@ -50,7 +50,7 @@ class TestLoggedCommandRunner(SubiTestCase):
"PYTHON": "/snap/subiquity/x1/usr/bin/python3.8",
"TARGET_MOUNT_POINT": "/target",
"SNAP": "/snap/subiquity/x1",
"DUMMY": "should-not-be-exported",
"SAMPLE": "should-not-be-exported",
}
with patch.dict(os.environ, environ, clear=True):

2
subiquity/tests/api/test_api.py
View File

@ -1260,7 +1260,7 @@ class TestCancel(TestAPI):
async def test_cancel_drivers(self):
with patch.dict(os.environ, {'SUBIQUITY_DEBUG': 'has-drivers'}):
async with start_server('examples/simple.json') as inst:
await inst.post('/source', source_id="dummy",
await inst.post('/source', source_id="placeholder",
search_drivers=True)
# /drivers?wait=true is expected to block until APT is
# configured.

4
subiquity/ui/views/keyboard.py
View File

@ -352,8 +352,8 @@ class KeyboardForm(Form):
cancel_label = _("Back")
layout = ChoiceField(_("Layout:"), choices=["dummy"])
variant = ChoiceField(_("Variant:"), choices=["dummy"])
layout = ChoiceField(_("Layout:"), choices=["placeholder"])
variant = ChoiceField(_("Variant:"), choices=["placeholder"])
class KeyboardView(BaseView):

6
subiquitycore/tests/test_lsb_release.py
View File

@ -32,8 +32,8 @@ DISTRIB_DESCRIPTION="Ubuntu 21.10"
"""
with patch(self.target, mock_open(read_data=lsb_str)) as patched:
distro = lsb_release(path="dummy")
patched.assert_called_once_with("dummy", "r")
distro = lsb_release(path="sample")
patched.assert_called_once_with("sample", "r")
self.assertEqual(distro["id"], "Ubuntu")
self.assertEqual(distro["release"], "21.10")
self.assertEqual(distro["codename"], "impish")
@ -55,4 +55,4 @@ DISTRIB_DESCRIPTION="Ubuntu 21.10"
def test_lsb_release_mutually_exclusive(self):
with self.assertRaises(ValueError):
lsb_release(path="dummy", dry_run=True)
lsb_release(path="sample", dry_run=True)

66
subiquitycore/ui/tests/test_form.py
View File

@ -29,11 +29,11 @@ class TestForm(TestCase):
""" Make sure Form.has_validation_form() returns:
* True if any field is in error
* False otherwise. """
class DummyForm(Form):
field1 = StringField("DummyStringOne", help="")
field2 = StringField("DummyStringTwo", help="")
class SampleForm(Form):
field1 = StringField("FieldOne", help="")
field2 = StringField("FieldTwo", help="")
form = DummyForm()
form = SampleForm()
form.field1.in_error = False
form.field2.in_error = False
@ -50,15 +50,15 @@ class TestForm(TestCase):
def test_has_validation_error_with_subform(self):
""" Make sure Form.has_validation_form() is affected by fields from
child forms (only if the child form is enabled). """
class DummySubForm(SubForm):
field1 = StringField("DummyString", help="")
class SampleSubForm(SubForm):
field1 = StringField("FieldString", help="")
class DummyForm(Form):
field1 = StringField("DummyString", help="")
dummy_subform = SubFormField(DummySubForm, "", help="")
class SampleForm(Form):
field1 = StringField("FieldString", help="")
sample_subform = SubFormField(SampleSubForm, "", help="")
form = DummyForm()
subform = form.dummy_subform.widget.form
form = SampleForm()
subform = form.sample_subform.widget.form
form.field1.in_error = False
subform.field1.in_error = False
@ -79,46 +79,46 @@ class TestForm(TestCase):
# Make sure fields in disabled subforms are ignored.
form.field1.in_error = False
subform.field1.in_error = True
form.dummy_subform.enabled = False
form.sample_subform.enabled = False
self.assertFalse(form.has_validation_error())
def test_has_validation_error_with_subsubform(self):
""" Make sure enabling/disabling parent forms also acts as if sub forms
are disabled. """
class DummySubSubForm(SubForm):
field1 = StringField("DummyString", help="")
class SampleSubSubForm(SubForm):
field1 = StringField("SampleString", help="")
class DummySubForm(SubForm):
dummy_subform = SubFormField(DummySubSubForm, "", help="")
class SampleSubForm(SubForm):
sample_subform = SubFormField(SampleSubSubForm, "", help="")
class DummyForm(Form):
dummy_subform = SubFormField(DummySubForm, "", help="")
class SampleForm(Form):
sample_subform = SubFormField(SampleSubForm, "", help="")
form = DummyForm()
subform = form.dummy_subform.widget.form
subsubform = subform.dummy_subform.widget.form
form = SampleForm()
subform = form.sample_subform.widget.form
subsubform = subform.sample_subform.widget.form
subsubform.field1.in_error = True
self.assertTrue(form.has_validation_error())
# If subsubform is disabled, it should be ignored.
subsubform.field1.in_error = True
subform.dummy_subform.enabled = False
subform.sample_subform.enabled = False
self.assertFalse(form.has_validation_error())
# If subform is disabled, it should also be ignored.
subsubform.field1.in_error = True
subform.dummy_subform.enabled = True
form.dummy_subform.enabled = False
subform.sample_subform.enabled = True
form.sample_subform.enabled = False
self.assertFalse(form.has_validation_error())
def test_done_button_auto_toggle(self):
""" Make sure calling validated() enables or disables the Done button.
"""
class DummyForm(Form):
field1 = StringField("DummyString", help="")
class SampleForm(Form):
field1 = StringField("SampleString", help="")
form = DummyForm()
form = SampleForm()
done_button = form.buttons.base_widget.contents[0][0]
form.field1.in_error = False
@ -132,14 +132,14 @@ class TestForm(TestCase):
def test_subform_validated_propagates(self):
""" Make sure calling validated() in a subform affects the Done button
in the parent form. """
class DummySubForm(SubForm):
field1 = StringField("DummyString", help="")
class SampleSubForm(SubForm):
field1 = StringField("SampleString", help="")
class DummyForm(Form):
dummy_subform = SubFormField(DummySubForm, "", help="")
class SampleForm(Form):
sample_subform = SubFormField(SampleSubForm, "", help="")
form = DummyForm()
subform = form.dummy_subform.widget.form
form = SampleForm()
subform = form.sample_subform.widget.form
done_button = form.buttons.base_widget.contents[0][0]
subform.field1.in_error = False