diff options
author | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
---|---|---|
committer | Christian Ehrhardt <christian.ehrhardt@canonical.com> | 2016-05-30 13:10:13 +0200 |
commit | aefffff0e3df98a435133b598217401c3f953cc6 (patch) | |
tree | 9a141352c311aa541f93de560fcfec9c0d213476 /test-requirements.txt | |
parent | 3c85315373306729443ef79fd8e54af46a7bc849 (diff) | |
parent | 0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff) | |
download | vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.tar.gz vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.zip |
merge with last upstream to avoid merging conflicts on MP
Diffstat (limited to 'test-requirements.txt')
-rw-r--r-- | test-requirements.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/test-requirements.txt b/test-requirements.txt index 2ab53707..651af11b 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,6 +3,9 @@ httpretty>=0.7.1 mock nose +# Only needed if you want to know the test times +# nose-timer + # Only really needed on older versions of python contextlib2 setuptools |