Merge "tests: fix inject_failure() for deployment built by apex" into stable/brahmaputra

diff --cc tests/run.sh
index c7956ea,b3560f5..7bb0da2
--- 1/tests/run.sh
--- 2/tests/run.sh
+++ b/tests/run.sh
@@@ -1,16 -1,19 +1,13 @@@
  #!/bin/bash -ex
 +##############################################################################
 +# Copyright (c) 2016 NEC Corporation and others.
  #
 -# Copyright 2016 NEC Corporation.
 -#
 -# Licensed under the Apache License, Version 2.0 (the "License"); you may
 -# not use this file except in compliance with the License. You may obtain
 -# a copy of the License at
 -#
 -#      http://www.apache.org/licenses/LICENSE-2.0
 -#
 -# Unless required by applicable law or agreed to in writing, software
 -# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 -# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 -# License for the specific language governing permissions and limitations
 -# under the License.
 +# All rights reserved. This program and the accompanying materials
 +# are made available under the terms of the Apache License, Version 2.0
 +# which accompanies this distribution, and is available at
 +# http://www.apache.org/licenses/LICENSE-2.0
 +##############################################################################
  
- #branch=$(git rev-parse --abbrev-ref HEAD)
- BRANCH=master
- 
  IMAGE_URL=https://launchpad.net/cirros/trunk/0.3.0/+download/cirros-0.3.0-x86_64-disk.img
  IMAGE_NAME=cirros
  IMAGE_FILE="${IMAGE_NAME}.img"