diff -Nru gnome-gmail-2.9/debian/changelog gnome-gmail-2.9/debian/changelog --- gnome-gmail-2.9/debian/changelog 2022-04-11 02:06:58.000000000 +0000 +++ gnome-gmail-2.9/debian/changelog 2022-04-11 13:53:30.000000000 +0000 @@ -1,3 +1,9 @@ +gnome-gmail (2.9-3) unstable; urgency=medium + + * Fix some tests. + + -- David Steele Mon, 11 Apr 2022 09:53:30 -0400 + gnome-gmail (2.9-2) unstable; urgency=medium * Add build dependency for setuptools. diff -Nru gnome-gmail-2.9/debian/patches/disable_buggy_test gnome-gmail-2.9/debian/patches/disable_buggy_test --- gnome-gmail-2.9/debian/patches/disable_buggy_test 1970-01-01 00:00:00.000000000 +0000 +++ gnome-gmail-2.9/debian/patches/disable_buggy_test 2022-04-11 13:53:30.000000000 +0000 @@ -0,0 +1,25 @@ +Description: Disable buggy test + . + The first test in test_main will hang with a modal dialog if + the app is not fully configured. +Author: David Steele + +--- a/test/test_main.py ++++ b/test/test_main.py +@@ -11,16 +11,6 @@ + pass + + +-@patch('gnomegmail.sys.exit', side_effect=MyTestException) +-def test_main_quick(default_mailer_fxt, config_fxt, monkeypatch): +- monkeypatch.setattr('gnomegmail.sys.argv', ['prog', '-q']) +- +- with pytest.raises(MyTestException): +- gnomegmail.main() +- +- assert gnomegmail.sys.exit.calledwith(0) +- +- + def b64grep(str, text): + try: + b64tst = base64.b64encode(str.encode()) in text.encode() diff -Nru gnome-gmail-2.9/debian/patches/series gnome-gmail-2.9/debian/patches/series --- gnome-gmail-2.9/debian/patches/series 2022-04-11 02:06:58.000000000 +0000 +++ gnome-gmail-2.9/debian/patches/series 2022-04-11 13:53:30.000000000 +0000 @@ -1 +1,2 @@ remove-setup-gi-dep +disable_buggy_test diff -Nru gnome-gmail-2.9/debian/tests/control gnome-gmail-2.9/debian/tests/control --- gnome-gmail-2.9/debian/tests/control 2022-04-11 02:06:58.000000000 +0000 +++ gnome-gmail-2.9/debian/tests/control 2022-04-11 13:53:30.000000000 +0000 @@ -1,2 +1,2 @@ -Test-Command: python3 setup.py test --pytest-args --ignore=test/test_setup.py +Test-Command: PYTHONPATH=`pwd` python3 -m pytest --ignore=test/test_setup.py Depends: @, python3-pytest, python3-mock, python3-gi, python3-distutils,