Update unit-tests and requirements files to reflect recent changes

Summary: Updated the unit tests to account for recent changes and correct failed tests

Test Plan: run pytest

Reviewers: tsimonq2

Reviewed By: tsimonq2

Differential Revision: https://phab.lubuntu.me/D8

requirements.txt

@@ -1,36 +1,26 @@
 asn1crypto==0.24.0
-atomicwrites==1.2.1
+cffi==1.12.2
-attrs==18.2.0
-cffi==1.11.5
 Click==7.0
-coverage==4.5.2
+cryptography==2.6.1
-cryptography==2.4.1
+distro==1.4.0
-distro==1.3.0
+entrypoints==0.3
-entrypoints==0.2.3
 Flask==1.0.2
-httplib2==0.11.3
+httplib2==0.12.1
-idna==2.7
 itsdangerous==1.1.0
 jeepney==0.4
-Jinja2==2.10
+Jinja2==2.10.1
-keyring==16.0.2
+keyring==19.0.1
 launchpadlib==1.10.6
-lazr.restfulclient==0.14.0
+lazr.restfulclient==0.14.2
 lazr.uri==1.0.3
-MarkupSafe==1.1.0
+MarkupSafe==1.1.1
-more-itertools==4.3.0
+oauthlib==3.0.1
-oauthlib==2.1.0
+pbr==5.1.3
-pbr==5.1.1
 phabricator==0.7.0
-pluggy==0.8.0
-py==1.7.0
 pycparser==2.19
-pytest==4.0.0
+SecretStorage==3.1.1
-pytest-cov==2.6.0
-SecretStorage==3.1.0
 six==1.11.0
 testresources==2.0.1
 versioneer==0.18
 wadllib==1.3.3
-Werkzeug==0.14.1
+Werkzeug==0.15.2
-twine==1.12.1

requirements_dev.txt

@@ -1,12 +1,70 @@
-pip==18.1
+alabaster==0.7.12
+argh==0.26.2
+asn1crypto==0.24.0
+atomicwrites==1.3.0
+attrs==19.1.0
+Babel==2.6.0
+bleach==3.1.0
 bumpversion==0.5.3
-wheel==0.32.1
+certifi==2019.3.9
-watchdog==0.9.0
+cffi==1.12.2
-flake8==3.5.0
+chardet==3.0.4
-tox==3.5.2
+Click==7.0
 coverage==4.5.1
-Sphinx==1.8.1
+cryptography==2.6.1
-twine==1.12.1
+distro==1.4.0
-
+docutils==0.14
+entrypoints==0.3
+filelock==3.0.10
+flake8==3.5.0
+Flask==1.0.2
+httplib2==0.12.1
+idna==2.8
+imagesize==1.1.0
+itsdangerous==1.1.0
+jeepney==0.4
+Jinja2==2.10.1
+keyring==19.0.1
+launchpadlib==1.10.6
+lazr.restfulclient==0.14.2
+lazr.uri==1.0.3
+MarkupSafe==1.1.1
+mccabe==0.6.1
+more-itertools==7.0.0
+oauthlib==3.0.1
+packaging==18.0
+pathtools==0.1.2
+pbr==5.1.3
+phabricator==0.7.0
+pkginfo==1.5.0.1
+pluggy==0.9.0
+py==1.8.0
+pycodestyle==2.3.1
+pycparser==2.19
+pyflakes==1.6.0
+Pygments==2.3.1
+pyparsing==2.3.0
 pytest==3.8.2
+pytest-cov==2.6.1
 pytest-runner==4.2
+pytz==2019.1
+PyYAML==5.1
+readme-renderer==24.0
+requests==2.21.0
+requests-toolbelt==0.9.1
+SecretStorage==3.1.1
+six==1.11.0
+snowballstemmer==1.2.1
+Sphinx==1.8.1
+sphinxcontrib-websupport==1.1.0
+testresources==2.0.1
+toml==0.10.0
+tox==3.5.2
+tqdm==4.31.1
+twine==1.12.1
+urllib3==1.24.1
+virtualenv==16.4.3
+wadllib==1.3.3
+watchdog==0.9.0
+webencodings==0.5.1
+Werkzeug==0.15.2

setup.py

@@ -14,8 +14,7 @@ with open('HISTORY.rst') as history_file:
 requirements = [
     'Click>=6.0',
     'Flask>=1.0.2',
-    'httplib2==0.11.3', # BJ - Currently the latest version of httplib2 (0.12.0)
+    'httplib2>=0.12.1',
-    # is not compatible with launchpadlib
     'launchpadlib>=1.10.6',
     'phabricator>=0.7.0',
     'versioneer>=0.18',

tests/.lugitorc

@@ -23,10 +23,14 @@ supported_versions =
     Xenial
     Trusty
 
-[connector.launchpad.package_names]
+[phabricator.package_names]
 rDEFAULTSETTINGS = lubuntu-default-settings
 rART = lubuntu-artwork
 rCALASETTINGS = calamares-settings-ubuntu
 rQTERMINALPACKAGING = qterminal
 rLXQTCONFIGPACKAGING = lxqt-config
 rNMTRAYPACKAGING = nm-tray
+
+[connector.jenkins]
+site = https://ci.lubuntu.me
+template_url = ssh://git@phab.lubuntu.me:2222/source/package.git

tests/test_config.py

@@ -48,15 +48,20 @@ def test_loading_config_hooks():
         'vglzi6t4gsumnilv27r27no7rs3vgs75')
     assert(CONFIG['phabricator']['hooks']['commithook'] ==\
         'znkyfflbcia5gviqx5ybad7s6uyfywxi')
-    assert(CONFIG['phabricator']['package_names'] ==\
+
-        {
+    # Package names
-            'rDEFAULTSETTINGS': 'lubuntu-default-settings',
+    assert(CONFIG['phabricator']['package_names']['rdefaultsettings'] ==\
-            'rART': 'lubuntu-artwork',
+        'lubuntu-default-settings')
-            'rCALASETTINGS': 'calamares-settings-ubuntu',
+    assert(CONFIG['phabricator']['package_names']['rart'] ==\
-            'rQTERMINALPACKAGING': 'qterminal',
+        'lubuntu-artwork')
-            'rLXQTCONFIGPACKAGING': 'lxqt-config',
+    assert(CONFIG['phabricator']['package_names']['rcalasettings'] ==\
-            'rNMTRAYPACKAGING': 'nm-tray',
+        'calamares-settings-ubuntu')
-        })
+    assert(CONFIG['phabricator']['package_names']['rqterminalpackaging'] ==\
+        'qterminal')
+    assert(CONFIG['phabricator']['package_names']['rlxqtconfigpackaging'] ==\
+        'lxqt-config')
+    assert(CONFIG['phabricator']['package_names']['rnmtraypackaging'] ==\
+        'nm-tray')
 
 
 def test_loading_config_connectors():

tests/test_launchpad.py

@@ -24,11 +24,11 @@ lugito.config.CONFIG = {
             },
         'package_names': {
             'rDEFAULTSETTINGS': 'lubuntu-default-settings',
-            'rART': 'lubuntu-artwork',
+            'rart': 'lubuntu-artwork',
             'rCALASETTINGS': 'calamares-settings-ubuntu',
             'rQTERMINALPACKAGING': 'qterminal',
             'rLXQTCONFIGPACKAGING': 'lxqt-config',
-            'rNMTRAYPACKAGING': 'nm-tray',
+            'rnmtraypackaging': 'nm-tray',
             },
         },
     'connectors': {
@@ -61,14 +61,21 @@ def test_init():
     assert(obj.staging == "production")
     assert(obj.version == "devel")
     assert(obj.supported_vers == ["Cosmic", "Bionic", "Xenial", "Trusty"])
-    assert(obj.package_names == {
+
-        'rDEFAULTSETTINGS': 'lubuntu-default-settings',
+    assert(obj.package_names['rdefaultsettings'] ==\
-        'rART': 'lubuntu-artwork',
+        'lubuntu-default-settings')
-        'rCALASETTINGS': 'calamares-settings-ubuntu',
+    assert(obj.package_names['rart'] ==\
-        'rQTERMINALPACKAGING': 'qterminal',
+        'lubuntu-artwork')
-        'rLXQTCONFIGPACKAGING': 'lxqt-config',
+    assert(obj.package_names['rcalasettings'] ==\
-        'rNMTRAYPACKAGING': 'nm-tray',
+        'calamares-settings-ubuntu')
-    })
+    assert(obj.package_names['rqterminalpackaging'] ==\
+        'qterminal')
+    assert(obj.package_names['rlxqtconfigpackaging'] ==\
+        'lxqt-config')
+    assert(obj.package_names['rnmtraypackaging'] ==\
+        'nm-tray')
+
+
 
 
 def test_get_package_name():
@@ -76,7 +83,7 @@ def test_get_package_name():
 
     obj = launchpad()
 
-    assert(obj.get_package_name('rART') == 'lubuntu-artwork')
+    assert(obj.get_package_name('rart') == 'lubuntu-artwork')
     assert(obj.get_package_name('rT') is None)
 
 
@@ -85,7 +92,7 @@ def test_get_package_name():
 
     obj = launchpad()
 
-    assert(obj.get_package_name('rNMTRAYPACKAGING') == 'nm-tray')
+    assert(obj.get_package_name('rnmtraypackaging') == 'nm-tray')
     assert(obj.get_package_name('rNMTRKAGING') is None)