Merge pull request #268 from linode/fix_kernel_test_regex

Updating the regexes for the kernels test

Author: alsaihn

test/kernels/kernels.bats

@@ -35,7 +35,7 @@ teardown() {
         local kernelWithFields
 
         for kernelWithFields in $kernelsList ; do
-            run bash -c "echo $kernelWithFields | egrep 'linode/.*,.*,(False|True),(False|True),(i386|x86_64),(False|True)'"
+            run bash -c "echo $kernelWithFields | egrep 'linode/.*,.*,(False|True),(i386|x86_64),(False|True),(False|True),.*'"
             [ "$status" -eq 0 ]
         done
     }
@@ -54,5 +54,5 @@ teardown() {
 
     assert_success
     assert_output --partial "id,version,kvm,architecture,pvops,deprecated,built"
-    assert_output --regexp "linode/.*,.*,(False|True),(False|True),(i386|x86_64),(False|True)"
+    assert_output --regexp "linode/.*,.*,(False|True),(i386|x86_64),(False|True),(False|True),.*"
 }

test/networking/networking.bats

@@ -35,7 +35,7 @@ teardown() {
     assert_success
 
     assert_line --index 0 --regexp "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}"
-    assert_line --index 0 --regexp "ipv4,True,li[0-9].*-[0-9].*\.members.linode.com,.*,[0-9][0-9][0-9][0-9][0-9][0-9][0-9]*"
+    assert_line --index 0 --regexp "ipv4,True,[0-9]{1,3}\-[0-9]{1,3}\-[0-9]{1,3}\-[0-9]{1,3}\.ip.linodeusercontent.com,.*,[0-9][0-9][0-9][0-9][0-9][0-9][0-9]*"
     assert_line --index 1 --regexp "ipv6,True,,.*,[0-9][0-9][0-9][0-9][0-9][0-9]*"
 
     # Gnarly Ipv6 Regex