← Back to branch summary

~marco-giusti/virtualbrick/deb-package

~marco-giusti/virtualbrick/deb-package

« back to all changes in this revision

Viewing changes to virtualbricks/tests/__init__.py

Committer: Marco Giusti
Date: 2014-09-09 15:45:03 UTC
mfrom: (738.3.125 qemu_settings_hidden_1366480)
Revision ID: marco.giusti@gmail.com-20140909154503-645lmxpo1ayxs822

Merge from upstream

files added:
virtualbricks/qemu.py

virtualbricks/tests/data

files removed:
virtualbricks/tests/cow.img

virtualbricks/tests/empty.vbp

virtualbricks/tests/test.img

virtualbricks/tests/test.vbp

virtualbricks/tests/test2.img

files renamed:
virtualbricks/tests/qemu-img => virtualbricks/tests/data/qemu-img

files modified:
setup.py

virtualbricks/_log.py

virtualbricks/brickfactory.py

virtualbricks/bricks.py

virtualbricks/configfile.py

virtualbricks/gui/_gui.py

virtualbricks/gui/data/importdialog.ui

virtualbricks/gui/data/qemuconfig.ui

virtualbricks/gui/dialogs.py

virtualbricks/log.py

virtualbricks/tests/__init__.py

virtualbricks/tests/test_bricks.py

virtualbricks/tests/test_configfile.py

virtualbricks/tests/test_deployment.py

virtualbricks/tests/test_gui.py

virtualbricks/tests/test_log.py

virtualbricks/tests/test_project.py

virtualbricks/tests/test_virtualmachines.py

virtualbricks/virtualmachines.py

Show diffs side-by-side

added added

removed removed

virtualbricks/tests/__init__.py

11

11

__builtins__["_"] = str

12

12

TEST_THREADS = 0x01

13

13

TEST_DEPLOYMENT = 0x02

14

TEST_DATA_PATH = os.path.join(os.path.dirname(__file__), "data")

14

15

15

16

16

17

def should_test_threads():

Older »