openstack/deb-python-dcos
Code Issues Proposed changes

fix marathon version tests

Browse Source
This commit is contained in:
Michael Gummelt
2015-06-30 10:27:42 -07:00
parent 8df69e5606
commit bdfd3d0848
5 changed files with 140 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
cli/tests/data/package/json/test_describe_app_marathon.json Normal file
View File

@@ -0,0 +1,67 @@
{
"app": {
"cmd": "LIBPROCESS_PORT=$PORT1 && ./bin/start --master zk://master.mesos:2181/mesos --checkpoint --failover_timeout 604800 --framework_name marathon-user --ha --zk zk://localhost:2181/mesos/marathon-user --http_port $PORT0 ",
"constraints": [
[
"hostname",
"UNIQUE"
]
],
"container": {
"docker": {
"image": "mesosphere/marathon:v0.9.0-RC3",
"network": "HOST"
},
"type": "DOCKER"
},
"cpus": 2.0,
"env": {
"JVM_OPTS": "-Xms256m -Xmx768m"
},
"id": "marathon-user",
"instances": 1,
"labels": {
"DCOS_PACKAGE_FRAMEWORK_NAME": "marathon-user",
"DCOS_PACKAGE_IS_FRAMEWORK": "true",
"DCOS_PACKAGE_METADATA": "eyJkZXNjcmlwdGlvbiI6ICJBIGNsdXN0ZXItd2lkZSBpbml0IGFuZCBjb250cm9sIHN5c3RlbSBmb3Igc2VydmljZXMgaW4gY2dyb3VwcyBvciBEb2NrZXIgY29udGFpbmVycy4iLCAiZnJhbWV3b3JrIjogdHJ1ZSwgImltYWdlcyI6IHsiaWNvbi1sYXJnZSI6ICJodHRwczovL2Rvd25sb2Fkcy5tZXNvc3BoZXJlLmlvL21hcmF0aG9uL2Fzc2V0cy9pY29uLXNlcnZpY2UtbWFyYXRob24tbGFyZ2UucG5nIiwgImljb24tbWVkaXVtIjogImh0dHBzOi8vZG93bmxvYWRzLm1lc29zcGhlcmUuaW8vbWFyYXRob24vYXNzZXRzL2ljb24tc2VydmljZS1tYXJhdGhvbi1tZWRpdW0ucG5nIiwgImljb24tc21hbGwiOiAiaHR0cHM6Ly9kb3dubG9hZHMubWVzb3NwaGVyZS5pby9tYXJhdGhvbi9hc3NldHMvaWNvbi1zZXJ2aWNlLW1hcmF0aG9uLXNtYWxsLnBuZyJ9LCAibGljZW5zZXMiOiBbeyJuYW1lIjogIkFwYWNoZSBMaWNlbnNlIFZlcnNpb24gMi4wIiwgInVybCI6ICJodHRwczovL2dpdGh1Yi5jb20vbWVzb3NwaGVyZS9tYXJhdGhvbi9ibG9iL21hc3Rlci9MSUNFTlNFIn1dLCAibWFpbnRhaW5lciI6ICJzdXBwb3J0QG1lc29zcGhlcmUuaW8iLCAibmFtZSI6ICJtYXJhdGhvbiIsICJwb3N0SW5zdGFsbE5vdGVzIjogIk1hcmF0aG9uIERDT1MgU2VydmljZSBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgaW5zdGFsbGVkIVxuXG5cdERvY3VtZW50YXRpb246IGh0dHBzOi8vbWVzb3NwaGVyZS5naXRodWIuaW8vbWFyYXRob25cblx0SXNzdWVzOiBodHRwczovZ2l0aHViLmNvbS9tZXNvc3BoZXJlL21hcmF0aG9uL2lzc3Vlc1xuIiwgInBvc3RVbmluc3RhbGxOb3RlcyI6ICJUaGUgTWFyYXRob24gRENPUyBTZXJ2aWNlIGhhcyBiZWVuIHVuaW5zdGFsbGVkIGFuZCB3aWxsIG5vIGxvbmdlciBydW4uXG5QbGVhc2UgZm9sbG93IHRoZSBpbnN0cnVjdGlvbnMgYXQgaHR0cDovL2RvY3MubWVzb3NwaGVyZS5jb20vc2VydmljZXMvbWFyYXRob24vI3VuaW5zdGFsbCB0byBjbGVhbiB1cCBhbnkgcGVyc2lzdGVkIHN0YXRlIiwgInByZUluc3RhbGxOb3RlcyI6ICJXZSByZWNvbW1lbmQgYSBtaW5pbXVtIG9mIG9uZSBub2RlIHdpdGggYXQgbGVhc3QgMiBDUFUncyBhbmQgMUdCIG9mIFJBTSBhdmFpbGFibGUgZm9yIHRoZSBNYXJhdGhvbiBTZXJ2aWNlLiIsICJzY20iOiAiaHR0cHM6Ly9naXRodWIuY29tL21lc29zcGhlcmUvbWFyYXRob24uZ2l0IiwgInRhZ3MiOiBbIm1lc29zcGhlcmUiLCAiZnJhbWV3b3JrIl0sICJ2ZXJzaW9uIjogIjAuOS4wLVJDMyJ9",
"DCOS_PACKAGE_NAME": "marathon",
"DCOS_PACKAGE_REGISTRY_VERSION": "1.0.0-rc1",
"DCOS_PACKAGE_RELEASE": "1",
"DCOS_PACKAGE_SOURCE": "https://github.com/mesosphere/universe/archive/version-1.x.zip",
"DCOS_PACKAGE_VERSION": "0.9.0-RC3"
},
"mem": 1024.0,
"ports": [
0,
0
],
"uris": []
},
"description": "A cluster-wide init and control system for services in cgroups or Docker containers.",
"framework": true,
"images": {
"icon-large": "https://downloads.mesosphere.io/marathon/assets/icon-service-marathon-large.png",
"icon-medium": "https://downloads.mesosphere.io/marathon/assets/icon-service-marathon-medium.png",
"icon-small": "https://downloads.mesosphere.io/marathon/assets/icon-service-marathon-small.png"
},
"licenses": [
{
"name": "Apache License Version 2.0",
"url": "https://github.com/mesosphere/marathon/blob/master/LICENSE"
}
],
"maintainer": "support@mesosphere.io",
"name": "marathon",
"postInstallNotes": "Marathon DCOS Service has been successfully installed!\n\n\tDocumentation: https://mesosphere.github.io/marathon\n\tIssues: https:/github.com/mesosphere/marathon/issues\n",
"postUninstallNotes": "The Marathon DCOS Service has been uninstalled and will no longer run.\nPlease follow the instructions at http://docs.mesosphere.com/services/marathon/#uninstall to clean up any persisted state",
"preInstallNotes": "We recommend a minimum of one node with at least 2 CPU's and 1GB of RAM available for the Marathon Service.",
"scm": "https://github.com/mesosphere/marathon.git",
"tags": [
"mesosphere",
"framework"
],
"versions": [
"0.8.1",
"0.9.0-RC3"
]
}

22
cli/tests/data/package/json/test_describe_cli_helloworld.json Normal file
View File

@@ -0,0 +1,22 @@
{
"command": {
"pip": [
"dcos<1.0",
"git+https://github.com/mesosphere/dcos-helloworld.git#dcos-helloworld=0.1.0"
]
},
"description": "Example DCOS application package",
"maintainer": "support@mesosphere.io",
"name": "helloworld",
"postInstallNotes": "A sample post-installation message",
"preInstallNotes": "A sample pre-installation message",
"tags": [
"mesosphere",
"example",
"subcommand"
],
"versions": [
"0.1.0"
],
"website": "https://github.com/mesosphere/dcos-helloworld"
}

29
cli/tests/data/package/json/test_describe_marathon.json Normal file
View File

@@ -0,0 +1,29 @@
{
"description": "A cluster-wide init and control system for services in cgroups or Docker containers.",
"framework": true,
"images": {
"icon-large": "https://downloads.mesosphere.io/marathon/assets/icon-service-marathon-large.png",
"icon-medium": "https://downloads.mesosphere.io/marathon/assets/icon-service-marathon-medium.png",
"icon-small": "https://downloads.mesosphere.io/marathon/assets/icon-service-marathon-small.png"
},
"licenses": [
{
"name": "Apache License Version 2.0",
"url": "https://github.com/mesosphere/marathon/blob/master/LICENSE"
}
],
"maintainer": "support@mesosphere.io",
"name": "marathon",
"postInstallNotes": "Marathon DCOS Service has been successfully installed!\n\n\tDocumentation: https://mesosphere.github.io/marathon\n\tIssues: https:/github.com/mesosphere/marathon/issues\n",
"postUninstallNotes": "The Marathon DCOS Service has been uninstalled and will no longer run.\nPlease follow the instructions at http://docs.mesosphere.com/services/marathon/#uninstall to clean up any persisted state",
"preInstallNotes": "We recommend a minimum of one node with at least 2 CPU's and 1GB of RAM available for the Marathon Service.",
"scm": "https://github.com/mesosphere/marathon.git",
"tags": [
"mesosphere",
"framework"
],
"versions": [
"0.8.1",
"0.9.0-RC3"
]
}

15
cli/tests/integrations/common.py
View File

@@ -4,6 +4,7 @@ import os
import subprocess
import requests
import six
from six.moves import urllib
@@ -254,8 +255,22 @@ def assert_lines(cmd, num_lines):
:type num_lines: int
:rtype: None
"""
returncode, stdout, stderr = exec_command(cmd)
assert returncode == 0
assert stderr == b''
assert len(stdout.decode('utf-8').split('\n')) - 1 == num_lines
def file_bytes(path):
""" Read all bytes from a file
:param path: path to file
:type path: str
:rtype: bytes
:returns: bytes from the file
"""
with open(path) as f:
return six.b(f.read())

177
cli/tests/integrations/test_package.py
View File

@@ -8,7 +8,7 @@ from dcos import subcommand
import pytest
from .common import (assert_command, assert_lines, delete_zk_nodes,
exec_command, get_services, service_shutdown,
exec_command, file_bytes, get_services, service_shutdown,
watch_all_deployments)
@@ -171,181 +171,18 @@ def test_describe_nonexistent():
def test_describe():
stdout = b"""\
{
"description": "A cluster-wide init and control system for services in \
cgroups or Docker containers.",
"framework": true,
"images": {
"icon-large": "https://downloads.mesosphere.io/marathon/assets/\
icon-service-marathon-large.png",
"icon-medium": "https://downloads.mesosphere.io/marathon/assets/\
icon-service-marathon-medium.png",
"icon-small": "https://downloads.mesosphere.io/marathon/assets/\
icon-service-marathon-small.png"
},
"licenses": [
{
"name": "Apache License Version 2.0",
"url": "https://github.com/mesosphere/marathon/blob/master/LICENSE"
}
],
"maintainer": "support@mesosphere.io",
"name": "marathon",
"postInstallNotes": "Marathon DCOS Service has been successfully \
installed!\\n\\n\\tDocumentation: https://\
mesosphere.github.io/marathon\\n\\tIssues: https:/github.com/mesosphere/\
marathon/issues\\n",
"postUninstallNotes": "The Marathon DCOS Service has been uninstalled and \
will no longer run.\\nPlease follow the instructions at http://docs.\
mesosphere.com/services/marathon/#uninstall to clean up any persisted state",
"preInstallNotes": "We recommend a minimum of one node with at least 2 \
CPU's and 1GB of RAM available for the Marathon Service.",
"scm": "https://github.com/mesosphere/marathon.git",
"tags": [
"mesosphere",
"framework"
],
"versions": [
"0.8.1"
]
}
"""
stdout = file_bytes(
'tests/data/package/json/test_describe_marathon.json')
assert_command(['dcos', 'package', 'describe', 'marathon'],
stdout=stdout)
stdout = b"""\
{
"command": {
"pip": [
"dcos<1.0",
"git+https://github.com/mesosphere/\
dcos-helloworld.git#dcos-helloworld=0.1.0"
]
},
"description": "Example DCOS application package",
"maintainer": "support@mesosphere.io",
"name": "helloworld",
"postInstallNotes": "A sample post-installation message",
"preInstallNotes": "A sample pre-installation message",
"tags": [
"mesosphere",
"example",
"subcommand"
],
"versions": [
"0.1.0"
],
"website": "https://github.com/mesosphere/dcos-helloworld"
}
"""
stdout = file_bytes(
'tests/data/package/json/test_describe_cli_helloworld.json')
assert_command(['dcos', 'package', 'describe', '--cli', 'helloworld'],
stdout=stdout)
stdout = b"""\
{
"app": {
"cmd": "LIBPROCESS_PORT=$PORT1 && ./bin/start --master zk://master\
.mesos:2181/mesos --checkpoint --failover_timeout 604800 --framework_\
name marathon-user --ha --zk zk://localhost:2181/mesos/\
marathon-user --http_port $PORT0 ",
"constraints": [
[
"hostname",
"UNIQUE"
]
],
"container": {
"docker": {
"image": "mesosphere/marathon:v0.8.1",
"network": "HOST"
},
"type": "DOCKER"
},
"cpus": 2.0,
"env": {
"JVM_OPTS": "-Xms256m -Xmx768m"
},
"id": "marathon-user",
"instances": 1,
"labels": {
"DCOS_PACKAGE_FRAMEWORK_NAME": "marathon-user",
"DCOS_PACKAGE_IS_FRAMEWORK": "true",
"DCOS_PACKAGE_METADATA": "eyJkZXNjcmlwdGlvbiI6ICJBIGNsdXN0ZXItd2lkZSBpbm\
l0IGFuZCBjb250cm9sIHN5c3RlbSBmb3Igc2VydmljZXMgaW4gY2dyb3VwcyBvciBEb2NrZXIgY29u\
dGFpbmVycy4iLCAiZnJhbWV3b3JrIjogdHJ1ZSwgImltYWdlcyI6IHsiaWNvbi1sYXJnZSI6ICJodH\
RwczovL2Rvd25sb2Fkcy5tZXNvc3BoZXJlLmlvL21hcmF0aG9uL2Fzc2V0cy9pY29uLXNlcnZpY2Ut\
bWFyYXRob24tbGFyZ2UucG5nIiwgImljb24tbWVkaXVtIjogImh0dHBzOi8vZG93bmxvYWRzLm1lc2\
9zcGhlcmUuaW8vbWFyYXRob24vYXNzZXRzL2ljb24tc2VydmljZS1tYXJhdGhvbi1tZWRpdW0ucG5n\
IiwgImljb24tc21hbGwiOiAiaHR0cHM6Ly9kb3dubG9hZHMubWVzb3NwaGVyZS5pby9tYXJhdGhvbi\
9hc3NldHMvaWNvbi1zZXJ2aWNlLW1hcmF0aG9uLXNtYWxsLnBuZyJ9LCAibGljZW5zZXMiOiBbeyJu\
YW1lIjogIkFwYWNoZSBMaWNlbnNlIFZlcnNpb24gMi4wIiwgInVybCI6ICJodHRwczovL2dpdGh1Yi\
5jb20vbWVzb3NwaGVyZS9tYXJhdGhvbi9ibG9iL21hc3Rlci9MSUNFTlNFIn1dLCAibWFpbnRhaW5l\
ciI6ICJzdXBwb3J0QG1lc29zcGhlcmUuaW8iLCAibmFtZSI6ICJtYXJhdGhvbiIsICJwb3N0SW5zdG\
FsbE5vdGVzIjogIk1hcmF0aG9uIERDT1MgU2VydmljZSBoYXMgYmVlbiBzdWNjZXNzZnVsbHkgaW5z\
dGFsbGVkIVxuXG5cdERvY3VtZW50YXRpb246IGh0dHBzOi8vbWVzb3NwaGVyZS5naXRodWIuaW8vbW\
FyYXRob25cblx0SXNzdWVzOiBodHRwczovZ2l0aHViLmNvbS9tZXNvc3BoZXJlL21hcmF0aG9uL2lz\
c3Vlc1xuIiwgInBvc3RVbmluc3RhbGxOb3RlcyI6ICJUaGUgTWFyYXRob24gRENPUyBTZXJ2aWNlIG\
hhcyBiZWVuIHVuaW5zdGFsbGVkIGFuZCB3aWxsIG5vIGxvbmdlciBydW4uXG5QbGVhc2UgZm9sbG93\
IHRoZSBpbnN0cnVjdGlvbnMgYXQgaHR0cDovL2RvY3MubWVzb3NwaGVyZS5jb20vc2VydmljZXMvbW\
FyYXRob24vI3VuaW5zdGFsbCB0byBjbGVhbiB1cCBhbnkgcGVyc2lzdGVkIHN0YXRlIiwgInByZUlu\
c3RhbGxOb3RlcyI6ICJXZSByZWNvbW1lbmQgYSBtaW5pbXVtIG9mIG9uZSBub2RlIHdpdGggYXQgbG\
Vhc3QgMiBDUFUncyBhbmQgMUdCIG9mIFJBTSBhdmFpbGFibGUgZm9yIHRoZSBNYXJhdGhvbiBTZXJ2\
aWNlLiIsICJzY20iOiAiaHR0cHM6Ly9naXRodWIuY29tL21lc29zcGhlcmUvbWFyYXRob24uZ2l0Ii\
wgInRhZ3MiOiBbIm1lc29zcGhlcmUiLCAiZnJhbWV3b3JrIl0sICJ2ZXJzaW9uIjogIjAuOC4xIn0=\
",
"DCOS_PACKAGE_NAME": "marathon",
"DCOS_PACKAGE_REGISTRY_VERSION": "1.0.0-rc1",
"DCOS_PACKAGE_RELEASE": "0",
"DCOS_PACKAGE_SOURCE": "https://github.com/mesosphere/universe/archive/\
version-1.x.zip",
"DCOS_PACKAGE_VERSION": "0.8.1"
},
"mem": 1024.0,
"ports": [
0,
0
],
"uris": []
},
"description": "A cluster-wide init and control system for services \
in cgroups or Docker containers.",
"framework": true,
"images": {
"icon-large": "https://downloads.mesosphere.io/marathon/assets/\
icon-service-marathon-large.png",
"icon-medium": "https://downloads.mesosphere.io/marathon/assets/\
icon-service-marathon-medium.png",
"icon-small": "https://downloads.mesosphere.io/marathon/assets/\
icon-service-marathon-small.png"
},
"licenses": [
{
"name": "Apache License Version 2.0",
"url": "https://github.com/mesosphere/marathon/blob/master/LICENSE"
}
],
"maintainer": "support@mesosphere.io",
"name": "marathon",
"postInstallNotes": "Marathon DCOS Service has been successfully \
installed!\\n\\n\\tDocumentation: https://\
mesosphere.github.io/marathon\\n\\tIssues: https:/github.com/mesosphere/\
marathon/issues\\n",
"postUninstallNotes": "The Marathon DCOS Service has been uninstalled and \
will no longer run.\\nPlease follow the instructions at http://docs.\
mesosphere.com/services/marathon/#uninstall to clean up any persisted state",
"preInstallNotes": "We recommend a minimum of one node with at least 2 \
CPU's and 1GB of RAM available for the Marathon Service.",
"scm": "https://github.com/mesosphere/marathon.git",
"tags": [
"mesosphere",
"framework"
],
"versions": [
"0.8.1"
]
}
"""
stdout = file_bytes(
'tests/data/package/json/test_describe_app_marathon.json')
assert_command(['dcos', 'package', 'describe', '--app', '--options',
'tests/data/package/marathon.json', 'marathon'],
stdout=stdout)