Merge lp:~canonical-platform-qa/snappy-ecosystem-tests/minor_tweaks into lp:snappy-ecosystem-tests

[Omer Akram]

Minor tweaks. Add copyright headers, fix imports and some flake8 complaints

Minor tweaks. Add copyright headers, fix imports and some flake8 complaints

[I Ahmad (iahmad)]

LGTM - except that either the get_store_credential should throw the exception or at least print the error message to warn the user that he/she haven't set the environment variables correctly. At the moment it become little difficult to find the the reason for test failing.

[lp:~canonical-platform-qa/snappy-ecosystem-tests/minor_tweaks]

7. By Omer Akram on 2017-02-07

don't use environ.get() as that does not throw when a variable is not found

[Omer Akram (om26er)]

I have updated the code so that if the environment variable is not found it throws.

[I Ahmad (iahmad)]

LGTM - please merge

[I Ahmad (iahmad)]

LGTM

review: Approve

=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2017-02-07 11:35:58 +0000
@@ -0,0 +1,2 @@
+nose >= 1.3.7
+xmlrunner >= 1.7.7

=== added file 'tests/__init__.py'
--- tests/__init__.py	1970-01-01 00:00:00 +0000
+++ tests/__init__.py	2017-02-07 11:35:58 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== modified file 'tests/helpers/__init__.py'
--- tests/helpers/__init__.py	2017-02-03 07:02:58 +0000
+++ tests/helpers/__init__.py	2017-02-07 11:35:58 +0000
@@ -1,11 +1,32 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import unittest
+
 from selenium import webdriver
-from selenium.webdriver.common.keys import Keys
 from selenium.webdriver.support.ui import WebDriverWait
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.common.exceptions import TimeoutException
 from selenium.webdriver.common.by import By
-import storeconfig
+
+from tests import storeconfig
 
 LOGIN_EMAIL, LOGIN_PASSWORD = storeconfig.get_store_credentials()
 STORE_URL = storeconfig.get_store_web_url()
@@ -16,12 +37,7 @@
 
 class UbuntuStoreWebTestsBase(unittest.TestCase):
 
-    @classmethod
-    def setUpClass(cls):
-        pass
-
     def setUp(self):
-        #
         # TODO - add support for multiple type browsers including Chrome, FF and IE
         options = webdriver.ChromeOptions()
         options.add_argument("--start-maximized")
@@ -122,7 +138,3 @@
     def tearDown(self):
         self.driver.close()
         self.driver.quit()
-
-    @classmethod
-    def tearDownClass(cls):
-        pass

=== modified file 'tests/helpers/ubuntu-store-tests-base.py'
--- tests/helpers/ubuntu-store-tests-base.py	2017-02-03 07:02:58 +0000
+++ tests/helpers/ubuntu-store-tests-base.py	2017-02-07 11:35:58 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== modified file 'tests/storeconfig.py'
--- tests/storeconfig.py	2017-02-03 07:02:58 +0000
+++ tests/storeconfig.py	2017-02-07 11:35:58 +0000
@@ -1,35 +1,44 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import os
 
+KEY_ENVIRON_STORE_LOGIN_EMAIL = 'UBUNTU_STORE_LOGIN_EMAIL'
+KEY_ENVIRON_STORE_LOGIN_PASSWORD = 'UBUNTU_STORE_LOGIN_PASSWORD'
+URL_WEB_STORE_PRODUCTION = 'https://myapps.developer.ubuntu.com/'
+URL_WEB_STORE_STAGING = 'https://myapps.developer.staging.ubuntu.com/'
+
 
 def get_store_credentials():
     """login credentials exported by shell environment"""
-    email=None
-    password=None
-
-    try:
-        email=os.environ['UBUNTU_STORE_LOGIN_EMAIL']
-        password=os.environ['UBUNTU_STORE_LOGIN_PASSWORD']
-    except KeyError as err:
-        print (err.message)
-
-    return email, password
+    return os.environ['UBUNTU_STORE_LOGIN_EMAIL'], \
+        os.environ['UBUNTU_STORE_LOGIN_PASSWORD']
 
 
 def is_staging():
     """Return False if environment variable PROD is exported"""
-    staging = True
-    try:
-        if os.environ["STAGING"] == "0":
-            staging = False
-    except KeyError:
-        pass
-
-    return staging
+    return os.environ.get('STAGING', "1") == "1"
 
 
 def get_store_web_url():
     """This will return Ubuntu Store web url from staging server,
     if optional staging argument is false then it will return
     production server url """
-    return "https://myapps.developer.staging.ubuntu.com/" if is_staging() \
-            else "https://myapps.developer.ubuntu.com/"
\ No newline at end of file
+    return URL_WEB_STORE_STAGING if is_staging() else URL_WEB_STORE_PRODUCTION

=== modified file 'tests/test-store-login.py'
--- tests/test-store-login.py	2017-02-03 07:02:58 +0000
+++ tests/test-store-login.py	2017-02-07 11:35:58 +0000
@@ -1,8 +1,30 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
 import unittest
+
 import xmlrunner
 
-from helpers import UbuntuStoreWebTestsBase
-from utils.snapcraft import Snapcraft
+from tests.helpers import UbuntuStoreWebTestsBase
+from tests.utils.snapcraft import Snapcraft
+
 
 class StoreLoginTests(UbuntuStoreWebTestsBase):
 
@@ -10,7 +32,8 @@
         super().setUp()
 
     def test_login_logout(self):
-        """Test login and logout functionality of snapcraft, web interface and snapd"""
+        """Test login and logout functionality of snapcraft, web interface
+        and snapd."""
         try:
             sc = Snapcraft()
             sc.login()
@@ -20,16 +43,16 @@
 
         self.login()
         self.assertEqual(self.driver.title, "Your packages", "Failed to login")
-        self.logout() #TODO - fragile as there is no unique way to identify the dropdown arrow
-        self.assertEqual(self.driver.title, "Sign in to see your packages", "Failed to logout")
-
-
-    def tearDown(self):
-        super().tearDown()
+        # TODO - fragile as there is no unique way to identify the dropdown arrow # NOQA
+        self.logout()
+        self.assertEqual(
+            self.driver.title, "Sign in to see your packages",
+            "Failed to logout")
+
 
 if __name__ == '__main__':
     unittest.main(
         testRunner=xmlrunner.XMLTestRunner(output='test-reports'),
         # these make sure that some options that are not applicable
         # remain hidden from the help menu.
-        failfast=False, buffer=False, catchbreak=False)
\ No newline at end of file
+        failfast=False, buffer=False, catchbreak=False)

=== modified file 'tests/utils/__init__.py'
--- tests/utils/__init__.py	2017-02-03 07:02:58 +0000
+++ tests/utils/__init__.py	2017-02-07 11:35:58 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#

=== modified file 'tests/utils/snapcraft.py'
--- tests/utils/snapcraft.py	2017-02-03 07:02:58 +0000
+++ tests/utils/snapcraft.py	2017-02-07 11:35:58 +0000
@@ -1,9 +1,30 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+import os
+
 import pexpect
-import sys
-import os
-import storeconfig
-
-#login credentials exported by shell environment
+
+from tests import storeconfig
+
+# login credentials exported by shell environment
 LOGIN_EMAIL, LOGIN_PASSWORD = storeconfig.get_store_credentials()
 
 

=== modified file 'tests/utils/snapd.py'
--- tests/utils/snapd.py	2017-02-03 07:02:58 +0000
+++ tests/utils/snapd.py	2017-02-07 11:35:58 +0000
@@ -0,0 +1,19 @@
+# -*- Mode: Python; coding: utf-8; indent-tabs-mode: nil; tab-width: 4 -*-
+
+#
+# Snappy Ecosystem Tests
+# Copyright (C) 2017 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#