First run at new system

Author: t8y8

setup.py

@@ -1,43 +1,8 @@
 try:
-    from setuptools import setup, Command
+    from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
-
-class LiveTestCommand(Command):
-
-    description = "Run tests against a live server"
-
-    # [('long', 'short', 'description')]
-    user_options = [('server=', 's', "Server to connect to"),
-                    ('site=', 't', "Sute to connect to"),
-                    ('username=', 'u', "Username for tests (system admin)")]
-
-    def initialize_options(self):
-        self.server = None
-        self.username = None
-        self.password = None
-        self.site = None
-
-    def finalize_options(self):
-        if self.server is None:
-            self.server = "DEFAULT SERVER"
-        if self.username is None:
-            self.username = "DEFAULT USERNAME"
-        if self.site is None:
-            self.site = ""
-
-        import getpass
-        self.password = getpass.getpass()
-
-    def run(self):
-        import subprocess as sp
-        import os
-
-        with open(os.devnull, 'wb') as silent:
-            sp.check_call(['python', 'smoke.py', self.server, self.username, self.password, self.site], stdout=silent)
-
-
 setup(
     name='tableauserverclient',
     version='0.3',
@@ -54,6 +19,5 @@ def run(self):
     ],
     tests_require=[
         'requests-mock>=1.0,<1.1a0'
-    ],
-    cmdclass={'livetest': LiveTestCommand}
+    ]
 )

smoke.py

@@ -0,0 +1 @@
+from . smoke import *

smoke/__init__.py

@@ -0,0 +1,77 @@
+import os
+import unittest
+
+import tableauserverclient as TSC
+
+class SignInSignOutSmokeTest(unittest.TestCase):
+
+    def setUp(self):
+        self.username = os.environ.get('TABLEAU_USERNAME', None)
+        self.server = os.environ.get('TABLEAU_SERVER', None)
+        self.password = os.environ.get('TABLEAU_PASSWORD', None)
+        self.site_id = os.environ.get('TABLEAU_SITE_ID', '')
+
+        if not (self.username and self.server and self.password):
+            raise unittest.SkipTest("Environment variables must be set when run from inside UnitTest")
+
+
+    def test_sign_in_sign_out(self):
+
+        authz = TSC.TableauAuth(self.username, self.password)
+        server = TSC.Server(self.server)
+
+        server.auth.sign_in(authz)
+        server.auth.sign_out()
+
+    def test_sign_in_get_sign_out(self):
+
+        authz = TSC.TableauAuth(self.username, self.password)
+        server = TSC.Server(self.server)
+
+        server.auth.sign_in(authz)
+
+        for w in TSC.Pager(server.workbooks):
+            print(w.name)
+
+        for u in TSC.Pager(server.users):
+            print(u.name)
+
+        for p in TSC.Pager(server.projects):
+            print(p.name)
+
+        for h in TSC.Pager(server.schedules):
+            print(h.name)
+
+        server.auth.sign_out()
+
+if __name__ == "__main__":
+    import argparse
+    import sys
+
+    parser = argparse.ArgumentParser(description='Initialize a server with content.')
+    parser.add_argument('--server', '-s', default=None, help='server address')
+    parser.add_argument('--site-id', '-si', default=None, help='site to use')
+    parser.add_argument('--username', '-u', default=None, help='username to sign into server')
+    parser.add_argument('unittest_args', nargs='*')
+    args = parser.parse_args()
+
+
+    # This could probably be made smarter, but after trying too hard
+    # to be clever, I opted for this simple and readable approach.
+    # This will merge whatever is provided in the command line into
+    # your environment variables
+
+    if os.environ.get('TABLEAU_SERVER', None) is None:
+        os.environ['TABLEAU_SERVER'] = args.server
+
+    if os.environ.get('TABLEAU_USERNAME', None) is None:
+        os.environ['TABLEAU_USERNAME'] = args.username
+
+    if os.environ.get('TABLEAU_PASSWORD', None) is None:
+        import getpass
+        password = getpass.getpass("Password: ")
+        os.environ['TABLEAU_PASSWORD'] = password
+
+    # Makes unittest and standalone play nice see http://stackoverflow.com/questions/1029891/
+    sys.argv[1:] = args.unittest_args
+    unittest.main()

smoke/smoke.py

@@ -51,6 +51,7 @@ def _clear_auth(self):
         self._site_id = None
         self._user_id = None
         self._auth_token = None
+        self._session.close()
         self._session = requests.Session()
 
     def _set_auth(self, site_id, user_id, auth_token):