Changeset 184

Timestamp:

08/27/08 17:04:00 (3 months ago)

Author:

rgrp

Message:

[data][s]: move microfacts/tests/data to microfacts/data so data can be used running tests/init.py (which overrides config setup!).

Files:

• trunk/microfacts/data (moved) (moved from trunk/microfacts/tests/data)
• trunk/microfacts/lib/cli.py (modified) (1 diff)
• trunk/microfacts/tests/functional/test_factlet.py (modified) (1 diff)
• trunk/microfacts/tests/functional/test_thread.py (modified) (1 diff)
• trunk/microfacts/tests/test_json.py (modified) (2 diffs)

trunk/microfacts/lib/cli.py

@@ -68 +68 @@
-        import microfacts.model as model
-        import microfacts.lib.json
-.tests
+
-                'data/bloomsbury.js')
-        out = microfacts.lib.json.load(data)

trunk/microfacts/tests/functional/test_factlet.py

@@ -10 +10 @@
-        import pkg_resources
-        sample = pkg_resources.resource_stream(
-.tests
+
-        )
-        out = microfacts.lib.json.load(sample)

trunk/microfacts/tests/functional/test_thread.py

@@ -10 +10 @@
-        import pkg_resources
-        sample = pkg_resources.resource_stream(
-.tests
+
-        )
-        out = microfacts.lib.json.load(sample)

trunk/microfacts/tests/test_json.py

@@ -99 +99 @@
-        model.Session.clear()
-        model.Session.begin()
-.tests
+
-        self.converter = json.FactletConverter()
-
@@ -123 +123 @@
-        model.Session.clear()
-        model.Session.begin()
-.tests
+
-                'data/napoleon2.js')
-        self.converter = json.ThreadConverter()