Ubuntu Apps Directory

Merge lp:~canonical-isd-hackers/ubuntu-webcatalog/move_testdata_777469 into lp:ubuntu-webcatalog

  1. move_testdata_777469
  2. Merge into trunk
Proposed by Danny Tamez
Status: Merged
Approved by: Michael Hall
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~canonical-isd-hackers/ubuntu-webcatalog/move_testdata_777469
Merge into: lp:ubuntu-webcatalog
Diff against target: 14 lines (+1/-1)
1 file modified
src/webcatalog/tests/test_commands.py (+1/-1)
To merge this branch: bzr merge lp:~canonical-isd-hackers/ubuntu-webcatalog/move_testdata_777469
Reviewer Review Type Date Requested Status
Michael Hall (community) Approve
Review via email: mp+65066@code.launchpad.net

Commit message

Changing location for a test's datafile.

Description of the change

Changing location for a test's datafile.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Looks good to me.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/webcatalog/tests/test_commands.py'
2--- src/webcatalog/tests/test_commands.py 2011-06-17 16:21:59 +0000
3+++ src/webcatalog/tests/test_commands.py 2011-06-17 21:31:14 +0000
4@@ -315,7 +315,7 @@
5
6 def setUp(self):
7 curdir = os.path.dirname(__file__)
8- sca_apps_file = os.path.join(curdir, 'sca_apps.txt')
9+ sca_apps_file = os.path.join(curdir, 'test_data', 'sca_apps.txt')
10 with open(sca_apps_file) as content:
11 self.response_content = content.read()
12 mock_response = Mock()
13
14=== renamed file 'src/webcatalog/tests/sca_apps.txt' => 'src/webcatalog/tests/test_data/sca_apps.txt'

Subscribers

People subscribed via source and target branches