-
Notifications
You must be signed in to change notification settings - Fork 344
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1054 from vnitinv/fix-ut-UnicodeDecodeError
fix UnicodeDecodeError due to \ufeff char before <rpc-reply>
- Loading branch information
Showing
9 changed files
with
81 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,22 @@ | ||
| <rpc-reply xmlns:junos="http://xml.juniper.net/junos/12.1X46/junos"> | ||
| <configuration junos:commit-seconds="1400665891" junos:commit-localtime="2014-05-21 09:51:31 UTC" junos:commit-user="rick"> | ||
| <system> | ||
| <login> | ||
| <user group="global"> | ||
| <name group="global">test</name> | ||
| <full-name group="member0">Test User</full-name> | ||
| <uid group="global">928</uid> | ||
| <class group="global">superuser</class> | ||
| <undocumented><shell group="global">csh</shell></undocumented> | ||
| <authentication group="global"> | ||
| <encrypted-password group="global">$encryptedpass.</encrypted-password> | ||
| </authentication> | ||
| </user> | ||
| </login> | ||
| </system> | ||
| </configuration> | ||
| <rpc-reply xmlns:junos="http://xml.juniper.net/junos/12.1X46/junos"> | ||
| <configuration junos:commit-seconds="1400665891" junos:commit-localtime="2014-05-21 09:51:31 UTC" junos:commit-user="rick"> | ||
| <system> | ||
| <login> | ||
| <user group="global"> | ||
| <name group="global">test</name> | ||
| <full-name group="member0">Test User</full-name> | ||
| <uid group="global">928</uid> | ||
| <class group="global">superuser</class> | ||
| <undocumented><shell group="global">csh</shell></undocumented> | ||
| <authentication group="global"> | ||
| <encrypted-password group="global">$encryptedpass.</encrypted-password> | ||
| </authentication> | ||
| </user> | ||
| </login> | ||
| </system> | ||
| </configuration> | ||
| <cli> | ||
| <banner></banner> | ||
| </cli> | ||
| </rpc-reply> | ||
| </cli> | ||
| </rpc-reply> | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/unit/facts/rpc-reply/vc_mmvc_get-virtual-chassis-information.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/unit/facts/rpc-reply/vc_mmvcf_get-virtual-chassis-information.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/unit/ofacts/rpc-reply/get-virtual-chassis-information.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
tests/unit/ofacts/rpc-reply/get-virtual-chassis-information_mmvcf.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| <rpc-error xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:junos="http://xml.juniper.net/junos/12.1X46/junos" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"> | ||
| <error-severity>error</error-severity> | ||
| <error-info> | ||
| <bad-element>get-permission-denied</bad-element> | ||
| </error-info> | ||
| <error-message>permission denied</error-message> | ||
| <rpc-error xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:junos="http://xml.juniper.net/junos/12.1X46/junos" xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0"> | ||
| <error-severity>error</error-severity> | ||
| <error-info> | ||
| <bad-element>get-permission-denied</bad-element> | ||
| </error-info> | ||
| <error-message>permission denied</error-message> | ||
| </rpc-error> |
20 changes: 10 additions & 10 deletions
20
tests/unit/utils/rpc-reply/request-package-rollback-multi-error.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,40 @@ | ||
| <rpc-reply xmlns="urn:ietf:params:xml:ns:netconf:base:1.0" xmlns:junos="http://xml.juniper.net/junos/10.4R3/junos"> | ||
| <cli> | ||
| <ignore-signals> | ||
| hup | ||
| </ignore-signals> | ||
| </cli> | ||
| <output> | ||
| Checking compatibility with configuration | ||
| Initializing... | ||
| rm: /var/validate/chroot/var/etc/pam.conf: Operation not permitted | ||
| rm: /var/validate/chroot/var/etc: Directory not empty | ||
| rm: /var/validate/chroot/var: Directory not empty | ||
| rm: /var/validate/chroot: Directory not empty | ||
| Using jbase-13.2I20140401_1054_katharh | ||
| Using /var/tmp/py-extensions-i386-13.2I20140430_1237_katharh.tgz | ||
| Checking py-extensions-i386 requirements on / | ||
| Verified py-extensions-i386-13.2I20140430_1237_katharh signed by PackageDevelopment_13_2_0 | ||
| Registering py-extensions-i386 as unsupported | ||
| Using jruntime-13.2I20140401_1054_katharh | ||
| Using jkernel-13.2I20140401_1054_katharh | ||
| Using jroute-13.2I20140401_1054_katharh | ||
| Using jcrypto-13.2I20140401_1054_katharh | ||
| cp: /var/validate/chroot/var/etc/pam.conf: Operation not permitted | ||
| Hardware Database regeneration succeeded | ||
| Validating against /config/juniper.conf.gz | ||
| mgd: error: schema: dbs_remap_daemon_index: could not find daemon name 'analyticsd' | ||
| mgd: warning: schema: init: 'logical-systems-vlans' contains-node 'juniper-config vlans': not found | ||
| mgd: error: rename failed for /var/etc/pam.conf | ||
| mgd: commit complete | ||
| Validation succeeded | ||
| rm: /var/validate/chroot/var/etc/pam.conf: Operation not permitted | ||
| rm: /var/validate/chroot/var/etc: Directory not empty | ||
| rm: /var/validate/chroot/var: Directory not empty | ||
| rm: /var/validate/chroot: Directory not empty | ||
| </output> | ||
| <package-result>0</package-result> | ||
| <cli> | ||
| <banner></banner> | ||
| </cli> | ||
| <cli> | ||
| <ignore-signals> | ||
| hup | ||
| </ignore-signals> | ||
| </cli> | ||
| <output> | ||
| Checking compatibility with configuration | ||
| Initializing... | ||
| rm: /var/validate/chroot/var/etc/pam.conf: Operation not permitted | ||
| rm: /var/validate/chroot/var/etc: Directory not empty | ||
| rm: /var/validate/chroot/var: Directory not empty | ||
| rm: /var/validate/chroot: Directory not empty | ||
| Using jbase-13.2I20140401_1054_katharh | ||
| Using /var/tmp/py-extensions-i386-13.2I20140430_1237_katharh.tgz | ||
| Checking py-extensions-i386 requirements on / | ||
| Verified py-extensions-i386-13.2I20140430_1237_katharh signed by PackageDevelopment_13_2_0 | ||
| Registering py-extensions-i386 as unsupported | ||
| Using jruntime-13.2I20140401_1054_katharh | ||
| Using jkernel-13.2I20140401_1054_katharh | ||
| Using jroute-13.2I20140401_1054_katharh | ||
| Using jcrypto-13.2I20140401_1054_katharh | ||
| cp: /var/validate/chroot/var/etc/pam.conf: Operation not permitted | ||
| Hardware Database regeneration succeeded | ||
| Validating against /config/juniper.conf.gz | ||
| mgd: error: schema: dbs_remap_daemon_index: could not find daemon name 'analyticsd' | ||
| mgd: warning: schema: init: 'logical-systems-vlans' contains-node 'juniper-config vlans': not found | ||
| mgd: error: rename failed for /var/etc/pam.conf | ||
| mgd: commit complete | ||
| Validation succeeded | ||
| rm: /var/validate/chroot/var/etc/pam.conf: Operation not permitted | ||
| rm: /var/validate/chroot/var/etc: Directory not empty | ||
| rm: /var/validate/chroot/var: Directory not empty | ||
| rm: /var/validate/chroot: Directory not empty | ||
| </output> | ||
| <package-result>0</package-result> | ||
| <cli> | ||
| <banner></banner> | ||
| </cli> | ||
| </rpc-reply> |