Browse Source

Better coverage

git-svn-id: https://bucket.mit.edu/svn/nilm/nilmdb@10684 ddd99763-3ecb-0310-9145-efcb8ce7c51f
tags/bxinterval-last
Jim Paris 12 years ago
parent
commit
d58a27e2bf
2 changed files with 18 additions and 3 deletions
  1. +4
    -3
      nilmdb/cmdline.py
  2. +14
    -0
      tests/test_cmdline.py

+ 4
- 3
nilmdb/cmdline.py View File

@@ -220,7 +220,7 @@ class Cmdline(object):
# Extract key=value pairs
data = {}
for keyval in keyvals:
kv = keyval.split('=', 1)
kv = keyval.split('=')
if len(kv) != 2 or kv[0] == "":
self.die("Error parsing key=value argument '%s'\n", keyval)
data[kv[0]] = kv[1]
@@ -262,10 +262,11 @@ class Cmdline(object):
if not os.path.exists(filename):
self.die("Error opening input file %s\n", filename)
try:
# zcat is _much_ faster than python's gzopen
# zcat is much faster than python's gzopen.
# We've checked that the file already exists
process = subprocess.Popen(["zcat", "-f", filename],
bufsize = -1,
stdin = None,
stdin = open(os.devnull),
stderr = None,
stdout = PIPE)
infile = process.stdout


+ 14
- 0
tests/test_cmdline.py View File

@@ -194,6 +194,20 @@ class TestCmdline(object):
self.ok("metadata /newton/raw --update "
"v_scale=1.234")

# various parsing tests
self.ok("metadata /newton/raw --update foo=")
self.fail("metadata /newton/raw --update =bar")
self.fail("metadata /newton/raw --update foo==bar")
self.fail("metadata /newton/raw --update foo;bar")

# errors
self.fail("metadata /newton/nosuchstream foo=bar")
self.contain("unrecognized arguments")
self.fail("metadata /newton/nosuchstream")
self.contain("No stream at path")
self.fail("metadata /newton/nosuchstream --set foo=bar")
self.contain("No stream at path")

self.ok("metadata /newton/prep")
self.match("description=The Data\nv_scale=1.234\n")



Loading…
Cancel
Save