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

Jump to bottom

Adapt integration tests to goth version 0.6.3 #595

Merged
merged 2 commits into from
Aug 17, 2021
Merged

Adapt integration tests to goth version 0.6.3 #595

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42030a7
Fix stable branch name regex in nightly workflow (#593)
kmazurek Aug 13, 2021
215b154
Update agent env vars in resubscription test
kmazurek Aug 16, 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
2 changes: 1 addition & 1 deletion .github/workflows/goth-nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
id: latest-stable
# second sed expression removes leading whitespaces and '*' characters (git uses it to indicate the current branch)
run: |
branch=$(git branch -a | sed -e 's:remotes/origin/::' -e 's:^[ \t*]*::' | grep -E '^release\/v[0-9]+(\.[0-9]+)+$' | sort -Vr | head -1)
branch=$(git branch -a | sed -e 's:remotes/origin/::' -e 's:^[ \t*]*::' | grep -E '^b[0-9]+(\.[0-9]+)+$' | sort -Vr | head -1)
echo "::set-output name=branch::$branch"

# prepares JSON object representing strategy matrix which contains two 'branch' variants: master and latest stable
Expand Down
4 changes: 2 additions & 2 deletions tests/goth_tests/test_resubscription.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,8 +151,8 @@ async def test_demand_resubscription(log_dir: Path, goth_config_path: Path, monk
async with runner(goth_config.containers):

requestor = runner.get_probes(probe_type=RequestorProbe)[0]
env = {**os.environ}
requestor.set_agent_env_vars(env)
env = dict(os.environ)
env.update(requestor.get_agent_env_vars())

# Setup the environment for the requestor
for key, val in env.items():
Expand Down