Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft: Fix ci #1096

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
+9 −0
Open

Draft: Fix ci #1096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9efef02
Check return type is an etree Element, if not return None for no chan…
dangoscomb Jan 4, 2021
02cbd1b
adding openssl to windows agent
Feb 1, 2021
7821b5c
typo
Feb 1, 2021
a0e5196
typo in choco install...doh
Feb 2, 2021
3c3375c
added manual links to lib path
Feb 5, 2021
0851134
removing openssl and adding rust libs
Feb 8, 2021
8861ee1
disable rust build
Feb 8, 2021
868a2c9
need openssl after all
Feb 9, 2021
a312830
need openssl after all
Feb 9, 2021
c4ba249
need openssl after all
Feb 9, 2021
bbf189d
need openssl after all
Feb 9, 2021
0878123
debug windows env vars
Feb 10, 2021
103a98f
debug in wrong section
Feb 10, 2021
0aea414
debug in wrong section
Feb 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,15 @@ matrix:
python: 3.7
before_install:
- choco install python3 --version=3.7.4
- choco install openssl --version=1.1.1.900
- pip install ntc_templates==1.4.1
- pip install textfsm==0.4.1
env:
- PATH=/c/Python37:/c/Python37/Scripts:$PATH
- TRAVIS_PYTHON_VERSION=3.7
- CRYPTOGRAPHY_DONT_BUILD_RUST=1
- INCLUDE='C:\OpenSSL-Win32\include'
- LIB='C:\OpenSSL-Win32\lib'
addons:
apt:
packages:
Expand All @@ -29,6 +33,7 @@ addons:
- libxslt1-dev

install:
- "set"
- "pip install -r development.txt"
- "pip install -r requirements.txt"
- "pip install ."
Expand Down
4 changes: 4 additions & 0 deletions lib/jnpr/junos/utils/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,10 @@ def diff(self, rb_id=0, ignore_warning=False, use_fast_diff=False):
else:
raise

# Check return type is an etree Element, if not return None for no changes
if not type(rsp) == etree._Element:
return None

diff_txt = rsp.find("configuration-output").text
return None if diff_txt == "\n" else diff_txt

Expand Down