1 |
commit: 70190446ac3e2be5fc946da165a9eb81d8d6594b |
2 |
Author: Jauhien Piatlicki (jauhien) <piatlicki <AT> gmail <DOT> com> |
3 |
AuthorDate: Tue Jul 2 10:22:15 2013 +0000 |
4 |
Commit: Jauhien Piatlicki <piatlicki <AT> gmail <DOT> com> |
5 |
CommitDate: Tue Jul 2 10:22:15 2013 +0000 |
6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/g-sorcery.git;a=commit;h=70190446 |
7 |
|
8 |
tests/server: separate http server |
9 |
|
10 |
--- |
11 |
tests/server.py | 26 ++++++++++++++++++++++++++ |
12 |
tests/test_package_db.py | 17 ++--------------- |
13 |
2 files changed, 28 insertions(+), 15 deletions(-) |
14 |
|
15 |
diff --git a/tests/server.py b/tests/server.py |
16 |
new file mode 100644 |
17 |
index 0000000..ba4ed99 |
18 |
--- /dev/null |
19 |
+++ b/tests/server.py |
20 |
@@ -0,0 +1,26 @@ |
21 |
+#!/usr/bin/env python |
22 |
+# -*- coding: utf-8 -*- |
23 |
+ |
24 |
+""" |
25 |
+ server.py |
26 |
+ ~~~~~~~~~ |
27 |
+ |
28 |
+ test server |
29 |
+ |
30 |
+ :copyright: (c) 2013 by Jauhien Piatlicki |
31 |
+ :license: GPL-2, see LICENSE for more details. |
32 |
+""" |
33 |
+ |
34 |
+import http.server, threading |
35 |
+ |
36 |
+class Server(threading.Thread): |
37 |
+ def __init__(self): |
38 |
+ super().__init__() |
39 |
+ server_address = ('127.0.0.1', 8080) |
40 |
+ self.httpd = http.server.HTTPServer(server_address, http.server.SimpleHTTPRequestHandler) |
41 |
+ |
42 |
+ def run(self): |
43 |
+ self.httpd.serve_forever() |
44 |
+ |
45 |
+ def shutdown(self): |
46 |
+ self.httpd.shutdown() |
47 |
|
48 |
diff --git a/tests/test_package_db.py b/tests/test_package_db.py |
49 |
index 2994157..1433eb7 100644 |
50 |
--- a/tests/test_package_db.py |
51 |
+++ b/tests/test_package_db.py |
52 |
@@ -11,24 +11,11 @@ |
53 |
:license: GPL-2, see LICENSE for more details. |
54 |
""" |
55 |
|
56 |
-import json, http.server, os, shutil, tempfile, threading, \ |
57 |
- unittest |
58 |
+import json, os, shutil, tempfile, unittest |
59 |
|
60 |
from g_sorcery import package_db, exceptions |
61 |
|
62 |
- |
63 |
-class Server(threading.Thread): |
64 |
- def __init__(self): |
65 |
- super().__init__() |
66 |
- server_address = ('127.0.0.1', 8080) |
67 |
- self.httpd = http.server.HTTPServer(server_address, http.server.SimpleHTTPRequestHandler) |
68 |
- |
69 |
- def run(self): |
70 |
- self.httpd.serve_forever() |
71 |
- |
72 |
- def shutdown(self): |
73 |
- self.httpd.shutdown() |
74 |
- |
75 |
+from tests.server import Server |
76 |
|
77 |
class DummyDB(package_db.PackageDB): |
78 |
def __init__(self, directory, packages): |