commit d24f103572bc7dd16f4ffa844cc6b315be603656 · pyrox.dev/nixpkgs

+1 -1

lib/network/default.nix

···

       85
       85
        
               (

     

       86
       86
        
                 matches:

     

       87
       87
        
                 if matches == null then

     

       88
       88
       -
                   throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)''

     

       88
       88
       +
                   throw ''"${mac}" is not a valid MAC address (expected 6 octets of hex digits)''

     

       89
       89
        
                 else

     

       90
       90
        
                   matches

     

       91
       91
        
               )

+25 -25

lib/tests/network.sh

···

       132
       132
        
       expectSuccess 'mkEUI64Suffix "00.00.00.00.00.00"'  '"200:00ff:fe00:0000"'

     

       133
       133
        
       expectSuccess 'mkEUI64Suffix "000000000000"'       '"200:00ff:fe00:0000"'

     

       134
       134
        
       

     

       135
       135
       -
       expectFailure 'mkEUI64Suffix "123456789AB"'        "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       136
       136
       -
       expectFailure 'mkEUI64Suffix "123456789A"'         "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       137
       137
       -
       expectFailure 'mkEUI64Suffix "123456789"'          "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       138
       138
       -
       expectFailure 'mkEUI64Suffix "12345678"'           "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       139
       139
       -
       expectFailure 'mkEUI64Suffix "1234567"'            "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       140
       140
       -
       expectFailure 'mkEUI64Suffix "123456"'             "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       141
       141
       -
       expectFailure 'mkEUI64Suffix "12345"'              "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       142
       142
       -
       expectFailure 'mkEUI64Suffix "1234"'               "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       143
       143
       -
       expectFailure 'mkEUI64Suffix "123"'                "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       144
       144
       -
       expectFailure 'mkEUI64Suffix "12"'                 "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       145
       145
       -
       expectFailure 'mkEUI64Suffix "1"'                  "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       146
       146
       -
       expectFailure 'mkEUI64Suffix ""'                   "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       147
       147
       -
       expectFailure 'mkEUI64Suffix "------------"'       "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       148
       148
       -
       expectFailure 'mkEUI64Suffix "............"'       "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       149
       149
       -
       expectFailure 'mkEUI64Suffix "::::::::::::"'       "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       150
       150
       -
       expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"'        "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       151
       151
       -
       expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"'        "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       152
       152
       -
       expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"'  "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       153
       153
       -
       expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       154
       154
       -
       expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34'   "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       155
       155
       -
       expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34'   "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       156
       156
       -
       expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm'   "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       157
       157
       -
       expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM'   "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       158
       158
       -
       expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"'  "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       159
       159
       -
       expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"'  "is not a valid MAC address (expected 6 octets of hex digits with optional delimiters)"

     

       135
       135
       +
       expectFailure 'mkEUI64Suffix "123456789AB"'        "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       136
       136
       +
       expectFailure 'mkEUI64Suffix "123456789A"'         "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       137
       137
       +
       expectFailure 'mkEUI64Suffix "123456789"'          "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       138
       138
       +
       expectFailure 'mkEUI64Suffix "12345678"'           "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       139
       139
       +
       expectFailure 'mkEUI64Suffix "1234567"'            "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       140
       140
       +
       expectFailure 'mkEUI64Suffix "123456"'             "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       141
       141
       +
       expectFailure 'mkEUI64Suffix "12345"'              "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       142
       142
       +
       expectFailure 'mkEUI64Suffix "1234"'               "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       143
       143
       +
       expectFailure 'mkEUI64Suffix "123"'                "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       144
       144
       +
       expectFailure 'mkEUI64Suffix "12"'                 "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       145
       145
       +
       expectFailure 'mkEUI64Suffix "1"'                  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       146
       146
       +
       expectFailure 'mkEUI64Suffix ""'                   "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       147
       147
       +
       expectFailure 'mkEUI64Suffix "------------"'       "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       148
       148
       +
       expectFailure 'mkEUI64Suffix "............"'       "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       149
       149
       +
       expectFailure 'mkEUI64Suffix "::::::::::::"'       "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       150
       150
       +
       expectFailure 'mkEUI64Suffix "1:2:3:4:5:6"'        "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       151
       151
       +
       expectFailure 'mkEUI64Suffix "0.0.0.0.0.0"'        "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       152
       152
       +
       expectFailure 'mkEUI64Suffix "00:11:-2:AA:BB:CC"'  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       153
       153
       +
       expectFailure 'mkEUI64Suffix "00:-11:22:AA:BB:CC"' "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       154
       154
       +
       expectFailure 'mkEUI64Suffix "ab:cd:ef:g0:12:34"'  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       155
       155
       +
       expectFailure 'mkEUI64Suffix "AB:CD:EF:G0:12:34"'  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       156
       156
       +
       expectFailure 'mkEUI64Suffix "ab:cd:ef:gh:jk:lm"'  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       157
       157
       +
       expectFailure 'mkEUI64Suffix "AB:CD:EF:GH:JK:LM"'  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       158
       158
       +
       expectFailure 'mkEUI64Suffix "01:23:3a:bc:de:fg"'  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       159
       159
       +
       expectFailure 'mkEUI64Suffix "01:23:3A:BC:DE:FG"'  "is not a valid MAC address \(expected 6 octets of hex digits\)"

     

       160
       160
        
       

     

       161
       161
        
       echo >&2 tests ok