Merge remote-tracking branch 'upstream/dev' into dev

Author: jp94

.gitignore

@@ -15,6 +15,7 @@ obj/
 dist/
 MANIFEST
 build_scripts/windows/out
+cli-build-*/
 
 # Result of running python setup.py install/pip install -e
 RECORD.txt
@@ -23,6 +24,7 @@ build/
 
 # Test results
 TestResults/
+test_failures.txt
 
 # Credentials 
 credentials_real.json

.travis.yml

@@ -23,11 +23,11 @@ jobs:
       python: 3.6
     - stage: verify
       env: PURPOSE='Automation'
-      script: ./scripts/ci/test_automation.sh
+      script: travis_wait 30 ./scripts/ci/test_automation.sh
       python: 3.6
     - stage: verify
       env: PURPOSE='Automation'
-      script: ./scripts/ci/test_automation.sh
+      script: travis_wait 30 ./scripts/ci/test_automation.sh
       python: 2.7
     - stage: verify
       script: ./scripts/ci/test_static.sh

appveyor-dev.yml

@@ -63,7 +63,7 @@ on_success:
       {
           $folderPath = [System.IO.Path]::Combine("$env:TEMP\azure-cli-content", $folder)
           $subFolders = Get-ChildItem -Path $folderPath -Directory -Name
-          if ($subFolders -contains "$env:YML_OUTPUT_FOLDER" -and $subFolders -contains "$env:CONCEPTUAL_DOC_FOLDER")
+          if ($subFolders -contains "$env:YML_OUTPUT_FOLDER")
           {
               $docsRefAutogenFolder = [System.IO.Path]::Combine($folderPath, "$env:YML_OUTPUT_FOLDER")
               Get-ChildItem -Path $docsRefAutogenFolder | Remove-Item -Force -Recurse

appveyor-mooncake.yml

@@ -53,7 +53,7 @@ build_script:
       {
           $folderPath = [System.IO.Path]::Combine("$env:TEMP\azure-cli-content", $folder)
           $subFolders = Get-ChildItem -Path $folderPath -Directory -Name
-          if ($subFolders -contains "$env:YML_OUTPUT_FOLDER" -and $subFolders -contains "$env:CONCEPTUAL_DOC_FOLDER")
+          if ($subFolders -contains "$env:YML_OUTPUT_FOLDER")
           {
               $docsRefAutogenFolder = [System.IO.Path]::Combine($folderPath, "$env:YML_OUTPUT_FOLDER")
               Get-ChildItem -Path $docsRefAutogenFolder | Remove-Item -Force -Recurse

appveyor.yml

@@ -63,7 +63,7 @@ on_success:
       {
           $folderPath = [System.IO.Path]::Combine("$env:TEMP\azure-cli-content", $folder)
           $subFolders = Get-ChildItem -Path $folderPath -Directory -Name
-          if ($subFolders -contains "$env:YML_OUTPUT_FOLDER" -and $subFolders -contains "$env:CONCEPTUAL_DOC_FOLDER")
+          if ($subFolders -contains "$env:YML_OUTPUT_FOLDER")
           {
               $docsRefAutogenFolder = [System.IO.Path]::Combine($folderPath, "$env:YML_OUTPUT_FOLDER")
               Get-ChildItem -Path $docsRefAutogenFolder | Remove-Item -Force -Recurse

azure-cli2017.pyproj

@@ -64,7 +64,7 @@
     <Compile Include="azure-cli-core\azure\cli\core\tests\test_storage_validators.py" />
     <Compile Include="azure-cli-core\azure\cli\core\tests\test_telemetry.py" />
     <Compile Include="azure-cli-core\azure\cli\core\tests\test_util.py" />
-    <Compile Include="azure-cli-core\azure\cli\core\tests\test_validators.py" />
+    <Compile Include="azure-cli-core\azure\cli\core\tests\test_core_validators.py" />
     <Compile Include="azure-cli-core\azure\cli\core\util.py" />
     <Compile Include="azure-cli-core\azure\cli\core\_config.py" />
     <Compile Include="azure-cli-core\azure\cli\core\_debug.py" />
@@ -85,7 +85,6 @@
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\patches.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\preparers.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\utilities.py" />
-    <Compile Include="azure-cli-testsdk\azure\cli\testsdk\vcr_test_base.py" />
     <Compile Include="azure-cli-testsdk\azure\cli\testsdk\__init__.py" />
     <Compile Include="azure-cli-testsdk\setup.py" />
     <Compile Include="azure-cli\azure\cli\__init__.py" />
@@ -396,7 +395,7 @@
     <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\commands.py" />
     <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\custom.py" />
     <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\tests\latest\test_lab.py" />
-    <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\tests\latest\test_validators.py" />
+    <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\tests\latest\test_lab_validators.py" />
     <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\validators.py" />
     <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\_client_factory.py" />
     <Compile Include="command_modules\azure-cli-lab\azure\cli\command_modules\lab\_format.py" />
@@ -449,7 +448,7 @@
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_template_builder.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_util.py" />
     <Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_validators.py" />
-    <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\tests\latest\test_custom.py" />
+    <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\tests\latest\test_profile_custom.py" />
     <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\_completers.py" />
     <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\_format.py" />
     <Compile Include="command_modules\azure-cli-profile\azure\cli\command_modules\profile\_help.py">
@@ -489,7 +488,7 @@
     <Compile Include="command_modules\azure-cli-reservations\azure_bdist_wheel.py" />
     <Compile Include="command_modules\azure-cli-reservations\setup.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\test_api_check.py" />
-    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\test_custom.py" />
+    <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\test_resource_custom.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\test_locks.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\test_resource.py" />
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\tests\latest\test_resource_id_deletes.py" />
@@ -503,7 +502,7 @@
     <Compile Include="command_modules\azure-cli-resource\azure\cli\command_modules\resource\_params.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\custom.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\latest\role_scenario_test.py" />
-    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\latest\test_custom.py" />
+    <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\latest\test_role_custom.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\latest\test_graph.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\latest\test_role.py" />
     <Compile Include="command_modules\azure-cli-role\azure\cli\command_modules\role\tests\latest\test_role_commands_thru_mock.py" />

build_scripts/debian/build.sh

@@ -29,7 +29,7 @@ tmp_pkg_dir=$(mktemp -d)
 working_dir=$(mktemp -d)
 cd $working_dir
 source_dir=$local_repo
-deb_file=$local_repo/../azure-cli_${CLI_VERSION}-1_all.deb
+deb_file=$local_repo/../azure-cli_${CLI_VERSION}-${CLI_VERSION_REVISION:=1}_all.deb
 az_completion_file=$source_dir/az.completion
 # clean up old build output
 if [ -d "$source_dir/debian" ]
@@ -73,7 +73,7 @@ $debian_directory_creator $cli_debian_dir_tmp $az_completion_file $source_dir
 cp -r $cli_debian_dir_tmp/* $source_dir/debian
 cd $source_dir
 dpkg-buildpackage -us -uc
-echo "The archive is available at $working_dir/azure-cli_${CLI_VERSION}-1_all.deb"
+echo "The archive is available at $working_dir/azure-cli_${CLI_VERSION}-${CLI_VERSION_REVISION:=1}_all.deb"
 cp $deb_file ${BUILD_ARTIFACT_DIR}
 echo "The archive has also been copied to ${BUILD_ARTIFACT_DIR}"
 echo "Done."

build_scripts/debian/dir_creator.sh

@@ -39,7 +39,7 @@ echo '1.0' > $debian_dir/source/format
 echo '9' > $debian_dir/compat
 
 cat > $debian_dir/changelog <<- EOM
-azure-cli (${CLI_VERSION}-1) unstable; urgency=low
+azure-cli (${CLI_VERSION}-${CLI_VERSION_REVISION:=1}) unstable; urgency=low
 
   * Debian package release.
 
@@ -58,7 +58,7 @@ Homepage: https://github.com/azure/azure-cli
 
 Package: azure-cli
 Architecture: all
-Depends: \${misc:Depends}
+Depends: \${shlibs:Depends}, \${misc:Depends}
 Description: Azure CLI 2.0
  A great cloud needs great tools; we're excited to introduce Azure CLI 2.0,
  our next generation multi-platform command line experience for Azure.
@@ -90,9 +90,15 @@ THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 EOM
 
+# TODO: Instead of "_ssl.cpython-36m-x86_64-linux-gnu.so" only, find all .so files with "find debian/azure-cli/opt/az -type f -name '*.so'"
+
 cat > $debian_dir/rules << EOM
 #!/usr/bin/make -f
 
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+export DH_OPTIONS=-v
+
 %:
 ${TAB}dh \$@ --sourcedirectory $source_dir
 
@@ -104,11 +110,15 @@ ${TAB}echo "\043!/usr/bin/env bash\n/opt/az/bin/python3 -Im azure.cli \"\044\100
 ${TAB}chmod 0755 debian/azure-cli/usr/bin/az
 ${TAB}mkdir -p debian/azure-cli/etc/bash_completion.d/
 ${TAB}cat ${completion_script} > debian/azure-cli/etc/bash_completion.d/azure-cli
+${TAB}dpkg-shlibdeps -v --warnings=7 -Tdebian/azure-cli.substvars -dDepends -edebian/azure-cli/opt/az/bin/python3 debian/azure-cli/opt/az/lib/python3.6/lib-dynload/_ssl.cpython-36m-x86_64-linux-gnu.so
+
 
 override_dh_strip:
 ${TAB}dh_strip --exclude=_cffi_backend
 
 EOM
 
+cat $debian_dir/rules
+
 # debian/rules should be executable
 chmod 0755 $debian_dir/rules

doc/authoring_command_modules/README.md

@@ -155,23 +155,28 @@ Testing
 Run all tests in a module:
 
 ```
-run_tests --module <module> [--live] [--parallel]
+azdev test --modules <modules> [--live] [--series] [--discover] [--dest-file FILENAME]
 ```
 
 Run an individual test:
 
 ```
-run_tests --module <module> --test <file>.<class>[.<test>]
+azdev test --tests TEST [TEST ...] [--live] [--series] [--discover] [--dest-file FILENAME]
 ```
-For example `run_tests --module mymod --test test_myfoo.MyFooTests.test_myfoo`
+For example `azdev test --tests test_myfoo`
 
+The list of failed tests are displayed at the end of a run and dumped to the file specified with `--dest-file` or `test_failures.txt` if nothing is provided. This allows for conveniently replaying failed tests:
+
+```
+azdev test --src-file test_failures.txt [--live] [--series] [--discover]
+```
+
+Relying on the default filename, the list of failed tests should grow shorter as you fix the cause of the failures until there are no more failing tests.
 
 Style Checks
 ------------
 
 ```
-check_style --module <module> [--pylint] [--pep8]
-OR
 azdev style --module <module> [--pylint] [--pep8]
 ```