From e6b841b02fb4c547a4cc2adc33cb065611f8a011 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Sun, 7 Mar 2010 22:15:50 +0100
Subject: [PATCH] [tests] update the way test scripts are executed when
 directly called

---
 libraries/tests/client.py   | 2 ++
 libraries/tests/core.py     | 2 ++
 libraries/tests/db.py       | 1 +
 libraries/tests/fetchers.py | 1 +
 libraries/tests/i18n.py     | 6 ++++++
 libraries/tests/misc.py     | 6 ++++++
 libraries/tests/qa.py       | 3 ++-
 libraries/tests/security.py | 3 ++-
 libraries/tests/server.py   | 5 +++++
 libraries/tests/spm.py      | 1 +
 libraries/tests/tools.py    | 1 +
 11 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/libraries/tests/client.py b/libraries/tests/client.py
index 17a53dcdc..be14cb858 100644
--- a/libraries/tests/client.py
+++ b/libraries/tests/client.py
@@ -182,3 +182,5 @@ if __name__ == '__main__':
         etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
+    raise SystemExit(0)
+
diff --git a/libraries/tests/core.py b/libraries/tests/core.py
index 6d68442b1..84094d447 100644
--- a/libraries/tests/core.py
+++ b/libraries/tests/core.py
@@ -54,3 +54,5 @@ if __name__ == '__main__':
         from entropy.const import etpUi
         etpUi['debug'] = True
     unittest.main()
+    entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/db.py b/libraries/tests/db.py
index 9abf1d4d4..4d6ec1921 100644
--- a/libraries/tests/db.py
+++ b/libraries/tests/db.py
@@ -450,3 +450,4 @@ if __name__ == '__main__':
         etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/fetchers.py b/libraries/tests/fetchers.py
index 86c69e75f..65078d286 100644
--- a/libraries/tests/fetchers.py
+++ b/libraries/tests/fetchers.py
@@ -63,3 +63,4 @@ if __name__ == '__main__':
         etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/i18n.py b/libraries/tests/i18n.py
index 457107c22..0f1134215 100644
--- a/libraries/tests/i18n.py
+++ b/libraries/tests/i18n.py
@@ -110,4 +110,10 @@ class MiscTest(unittest.TestCase):
 
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
+    entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/misc.py b/libraries/tests/misc.py
index 3ef8a1d62..cbb561488 100644
--- a/libraries/tests/misc.py
+++ b/libraries/tests/misc.py
@@ -117,4 +117,10 @@ class MiscTest(unittest.TestCase):
         sender.send_text_email(mail_sender, mail_recipients, mail_sub, mail_msg)
 
 if __name__ == '__main__':
+    if "--debug" in sys.argv:
+        sys.argv.remove("--debug")
+        from entropy.const import etpUi
+        etpUi['debug'] = True
     unittest.main()
+    entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/qa.py b/libraries/tests/qa.py
index 1f81678d1..c60888caa 100644
--- a/libraries/tests/qa.py
+++ b/libraries/tests/qa.py
@@ -39,4 +39,5 @@ if __name__ == '__main__':
         from entropy.const import etpUi
         etpUi['debug'] = True
     unittest.main()
-    entropy.tools.kill_threads()
\ No newline at end of file
+    entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/security.py b/libraries/tests/security.py
index 5ebd486fe..5cc6fee32 100644
--- a/libraries/tests/security.py
+++ b/libraries/tests/security.py
@@ -127,4 +127,5 @@ if __name__ == '__main__':
         from entropy.const import etpUi
         etpUi['debug'] = True
     unittest.main()
-    entropy.tools.kill_threads()
\ No newline at end of file
+    entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/server.py b/libraries/tests/server.py
index 1364d6a12..d15183904 100644
--- a/libraries/tests/server.py
+++ b/libraries/tests/server.py
@@ -26,6 +26,9 @@ class EntropyRepositoryTest(unittest.TestCase):
         # create fake server repo
         self.Server = Server(fake_default_repo_id = self.default_repo,
             fake_default_repo_desc = 'foo desc', fake_default_repo = True)
+        foo_db = self.Server.open_server_repository(repo = self.default_repo,
+            read_only = False, lock_remote = False, is_new = True)
+        foo_db.initializeDatabase()
 
 
     def tearDown(self):
@@ -34,6 +37,7 @@ class EntropyRepositoryTest(unittest.TestCase):
         """
         sys.stdout.write("%s ran\n" % (self,))
         sys.stdout.flush()
+        self.Server.Cacher.stop()
         self.Server.destroy()
 
     def test_server_instance(self):
@@ -63,3 +67,4 @@ if __name__ == '__main__':
         etpUi['debug'] = True
     unittest.main()
     entropy.tools.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/spm.py b/libraries/tests/spm.py
index af9997c34..9118dfdec 100644
--- a/libraries/tests/spm.py
+++ b/libraries/tests/spm.py
@@ -146,3 +146,4 @@ if __name__ == '__main__':
         etpUi['debug'] = True
     unittest.main()
     et.kill_threads()
+    raise SystemExit(0)
diff --git a/libraries/tests/tools.py b/libraries/tests/tools.py
index ed9230ddf..bf42de64a 100644
--- a/libraries/tests/tools.py
+++ b/libraries/tests/tools.py
@@ -709,3 +709,4 @@ if __name__ == '__main__':
         etpUi['debug'] = True
     unittest.main()
     et.kill_threads()
+    raise SystemExit(0)