diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6cb7ecd142d182c5c70876004c9d4950c4a168d8..a2ebe19ff16ae52b8d1ed92ae766b15b9695c13e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,14 +22,14 @@ job_lint_bandit: image: morkolai/soitool-ci script: - bandit --version - - bandit -r soitool + - bandit -r soitool test job_lint_pydocstyle: stage: lint image: morkolai/soitool-ci script: - pydocstyle --version - - pydocstyle --convention=numpy soitool + - pydocstyle --match '.*.py' --convention=numpy soitool test job_test_gui_ubuntu_vnc: stage: test diff --git a/test/__init__.py b/test/__init__.py index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5f1ae119d6f959cc9e9b1a127e305d5145dc620e 100644 --- a/test/__init__.py +++ b/test/__init__.py @@ -0,0 +1 @@ +"""Tester koden vår.""" diff --git a/test/test_main.py b/test/test_main.py index 89b4b90820e7f622343ca54a401151f8b52def67..beadccfe5991936ceba67b155d69db315ddf1414 100644 --- a/test/test_main.py +++ b/test/test_main.py @@ -1,4 +1,4 @@ -"""Test CoolWidget""" +"""Test CoolWidget.""" import unittest import sys @@ -23,7 +23,7 @@ app = QtWidgets.QApplication(sys.argv) def wait(msec): - """Venter msec millisekunder + """Venter msec millisekunder. Bruker https://stackoverflow.com/a/34745326/3545896 @@ -32,24 +32,23 @@ def wait(msec): msec : number msec to wait """ - end = datetime_.now() + timedelta(milliseconds=msec) while datetime_.now() < end: app.processEvents() class TestMain(unittest.TestCase): - """TestCase for main""" + """TestCase for main.""" def setUp(self): - """Forbereder widget for testing""" + """Forbereder widget for testing.""" self.test_text1 = "A bad boy" self.test_text2 = "Hei Anders!" self.widget = main.CoolWidget(self.test_text1) self.widget.show() def test_starts_up(self): - """Test at widget kan starte opp""" + """Test at widget kan starte opp.""" self.assertEqual( self.widget.qlabel.text(), self.test_text1, @@ -57,7 +56,7 @@ class TestMain(unittest.TestCase): self.assertTrue(self.widget.isVisible()) def test_change_text_ok(self): - """Test at endring av tekst funker""" + """Test at endring av tekst funker.""" def change_text_and_ok(): while self.widget.dlg_input is None: @@ -75,7 +74,7 @@ class TestMain(unittest.TestCase): ) def test_change_text_not_ok(self): - """Test at avbrytelse av endring av tekster ikke endrer tekst""" + """Test at avbrytelse av endring av tekster ikke endrer tekst.""" def accept_popup(): QtTest.QTest.keyClick(app.activeModalWidget(), QtCore.Qt.Key_Enter)