Skip to content

Commit

Permalink
Fix stest assetissue017 failed in master
Browse files Browse the repository at this point in the history
  • Loading branch information
wangzihe committed Nov 30, 2018
1 parent b9e5344 commit 0cea0ef
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
5 changes: 1 addition & 4 deletions deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,7 @@ change_branch_CMD="sed -i '1c branch_name_in_CI=$TRAVIS_BRANCH' /data/workspace/

echo "$TRAVIS_BRANCH"

if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" || "$TRAVIS_BRANCH" = "Odyssey_v3.2" ]];then
if [ "$TRAVIS_BRANCH" = "master" ];then
change_branch_CMD="sed -i '1c branch_name_in_CI=Odyssey_v3.2' /data/workspace/docker_workspace/do_stest.sh"
fi
if [[ "$TRAVIS_BRANCH" = "develop" || "$TRAVIS_BRANCH" = "master" || "$TRAVIS_BRANCH" = "Odyssey_v3.2.1" ]];then
echo "init env"
ssh java-tron@$stest_server -p 22008 $change_branch_CMD
ssh java-tron@$stest_server -p 22008 sh /data/workspace/docker_workspace/do_stest.sh >$stestlogname 2>&1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public void btestGetPaginatedAssetIssueListException() {
Assert.assertTrue(assetIssueListPaginated.get().getAssetIssueCount() == 0);

//offset is 1, limit is 50.
offset = 1;
offset = 0;
limit = 50;
pageMessageBuilder = PaginatedMessage.newBuilder();
pageMessageBuilder.setOffset(offset);
Expand Down

0 comments on commit 0cea0ef

Please sign in to comment.