Since it was very simple, interdiff:
diff --git a/Makefile.am b/Makefile.am
index 6783e53..b6ebf49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -991,7 +991,6 @@ TEST_FILES = \
test/data/bdev-rbd/json_output_extra_matches.txt \
test/data/bdev-rbd/json_output_no_matches.txt \
test/data/bdev-rbd/json_output_ok.txt \
- test/data/bdev-rbd/plain_output_new_empty.txt \
test/data/bdev-rbd/plain_output_new_extra_matches.txt \
test/data/bdev-rbd/plain_output_new_no_matches.txt \
test/data/bdev-rbd/plain_output_new_ok.txt \
diff --git a/test/py/ganeti.bdev_unittest.py b/test/py/ganeti.bdev_unittest.py
index 1245965..8243375 100755
--- a/test/py/ganeti.bdev_unittest.py
+++ b/test/py/ganeti.bdev_unittest.py
@@ -364,8 +364,8 @@ class TestRADOSBlockDevice(testutils.GanetiTestCase):
testutils.ReadTestData("bdev-rbd/plain_output_new_no_matches.txt")
self.plain_output_new_extra_matches = \
testutils.ReadTestData("bdev-rbd/plain_output_new_extra_matches.txt")
- self.plain_output_new_empty = \
- testutils.ReadTestData("bdev-rbd/plain_output_new_empty.txt")
+ # This file is completely empty, and as such it's not shipped.
+ self.plain_output_new_empty = ""
self.json_output_ok = testutils.ReadTestData("bdev-rbd/json_output_ok.txt")
self.json_output_no_matches = \
testutils.ReadTestData("bdev-rbd/json_output_no_matches.txt")
On Tue, Feb 12, 2013 at 2:10 PM, Guido Trotter <[email protected]> wrote:
> On Tue, Feb 12, 2013 at 2:07 PM, Stratos Psomadakis <[email protected]> wrote:
>> On 02/12/2013 02:52 PM, Guido Trotter wrote:
>>> This will need my extra commit to allow empty files to be shipped (sent as
>>> RFC).
>> <snip>
>>
>> Hm, I didn't know about it. :/ I actually did that, because all the
>> other 'output' data were stored in files. Setting
>> self.plain_output_new_ok = "", or even passing "" directly to the parse
>> function would work fine too.
>>
>
> Would you like to update the patch to do that, then? :)
> I suppose it might make things easier!
>
> Thanks,
>
> Guido
>
> PS make lint and make distcheck are your friends to notice these problems! :)
--
Guido Trotter
Ganeti engineering
Google Germany
