Move tests under module
Also, while we're at it, clean up some bogus license headers.
This commit is contained in:
parent
8617ea36bf
commit
29543cd498
|
@ -2,7 +2,7 @@
|
|||
test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \
|
||||
OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \
|
||||
OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-160} \
|
||||
${PYTHON:-python} -m subunit.run discover -t ./ ./tests $LISTOPT $IDOPTION
|
||||
${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION
|
||||
|
||||
test_id_option=--load-list $IDFILE
|
||||
test_list_option=--list
|
||||
|
|
|
@ -56,7 +56,7 @@ class BaseTestCase(testtools.TestCase):
|
|||
|
||||
def setUp(self):
|
||||
super(BaseTestCase, self).setUp()
|
||||
|
||||
|
||||
repo_path = self.useFixture(GitRepo(git.Repo('.'))).path
|
||||
self.useFixture(DiveDir(repo_path))
|
||||
repo = git.Repo('.')
|
|
@ -1,12 +1,17 @@
|
|||
#
|
||||
# Copyright (c) 2012, 2013, 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Confidential computer software. Valid license from HP required for
|
||||
# possession, use or copying. Consistent with FAR 12.211 and 12.212,
|
||||
# Commercial Computer Software, Computer Software Documentation, and
|
||||
# Technical Data for Commercial Items are licensed to the U.S. Government
|
||||
# under vendor's standard commercial license.
|
||||
# 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.
|
||||
|
||||
"""Tests for the 'commands' module"""
|
||||
|
|
@ -1,17 +1,22 @@
|
|||
#
|
||||
# Copyright (c) 2012, 2013, 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Confidential computer software. Valid license from HP required for
|
||||
# possession, use or copying. Consistent with FAR 12.211 and 12.212,
|
||||
# Commercial Computer Software, Computer Software Documentation, and
|
||||
# Technical Data for Commercial Items are licensed to the U.S. Government
|
||||
# under vendor's standard commercial license.
|
||||
# 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.
|
||||
|
||||
"""Tests the drop module"""
|
||||
from tests import base
|
||||
|
||||
from git_upstream.commands import drop as d
|
||||
from git_upstream.tests import base
|
||||
from git import repo as r
|
||||
from git import GitCommandError
|
||||
|
|
@ -1,12 +1,17 @@
|
|||
#
|
||||
# Copyright (c) 2012, 2013, 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Confidential computer software. Valid license from HP required for
|
||||
# possession, use or copying. Consistent with FAR 12.211 and 12.212,
|
||||
# Commercial Computer Software, Computer Software Documentation, and
|
||||
# Technical Data for Commercial Items are licensed to the U.S. Government
|
||||
# under vendor's standard commercial license.
|
||||
# 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.
|
||||
|
||||
"""Tests for then 'log' module"""
|
||||
|
|
@ -1,18 +1,22 @@
|
|||
#
|
||||
# Copyright (c) 2012, 2013, 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Confidential computer software. Valid license from HP required for
|
||||
# possession, use or copying. Consistent with FAR 12.211 and 12.212,
|
||||
# Commercial Computer Software, Computer Software Documentation, and
|
||||
# Technical Data for Commercial Items are licensed to the U.S. Government
|
||||
# under vendor's standard commercial license.
|
||||
# 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.
|
||||
|
||||
"""Tests the supersede module"""
|
||||
|
||||
from tests import base
|
||||
|
||||
from git_upstream.commands import supersede as s
|
||||
from git_upstream.tests import base
|
||||
from git import repo as r
|
||||
from git import GitCommandError
|
||||
|
|
@ -1,12 +1,17 @@
|
|||
#
|
||||
# Copyright (c) 2012, 2013, 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Confidential computer software. Valid license from HP required for
|
||||
# possession, use or copying. Consistent with FAR 12.211 and 12.212,
|
||||
# Commercial Computer Software, Computer Software Documentation, and
|
||||
# Technical Data for Commercial Items are licensed to the U.S. Government
|
||||
# under vendor's standard commercial license.
|
||||
# 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.
|
||||
|
||||
"""Tests for then 'utils' module"""
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
#
|
||||
# Copyright (c) 2012, 2013, 2014 Hewlett-Packard Development Company, L.P.
|
||||
#
|
||||
# Confidential computer software. Valid license from HP required for
|
||||
# possession, use or copying. Consistent with FAR 12.211 and 12.212,
|
||||
# Commercial Computer Software, Computer Software Documentation, and
|
||||
# Technical Data for Commercial Items are licensed to the U.S. Government
|
||||
# under vendor's standard commercial license.
|
||||
#
|
Loading…
Reference in New Issue