Ansgar pushed to branch master at Debian FTP Team / dak
Commits:
-
7774c154
by Ansgar Burchardt at 2019-07-10T18:24:36Z
-
073fa6fa
by Ansgar Burchardt at 2019-07-10T18:25:52Z
2 changed files:
Changes:
| ... | ... | @@ -695,7 +695,7 @@ class ArchiveUpload(object): |
| 695 | 695 |
files = {}
|
| 696 | 696 |
try:
|
| 697 | 697 |
files = self.changes.files
|
| 698 |
- except InvalidChangesException:
|
|
| 698 |
+ except upload.InvalidChangesException:
|
|
| 699 | 699 |
# Do not raise an exception; upload will be rejected later
|
| 700 | 700 |
# due to the missing files
|
| 701 | 701 |
pass
|
| 1 |
-# This program is free software; you can redistribute it and/or modify
|
|
| 2 |
-# it under the terms of the GNU General Public License as published by
|
|
| 3 |
-# the Free Software Foundation; either version 2 of the License, or
|
|
| 4 |
-# (at your option) any later version.
|
|
| 5 |
- |
|
| 6 |
-# This program is distributed in the hope that it will be useful,
|
|
| 7 |
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
| 8 |
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
| 9 |
-# GNU General Public License for more details.
|
|
| 10 |
- |
|
| 11 |
-# You should have received a copy of the GNU General Public License
|
|
| 12 |
-# along with this program; if not, write to the Free Software
|
|
| 13 |
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
| 14 |
- |
|
| 15 |
-################################################################################
|
|
| 16 |
- |
|
| 17 |
-import pytest
|
|
| 18 |
-from sqlalchemy import create_engine
|
|
| 19 |
-from sqlalchemy.orm import sessionmaker
|
|
| 20 |
- |
|
| 21 |
-from daklib.database.all import Base
|
|
| 22 |
- |
|
| 23 |
- |
|
| 24 |
-Session = sessionmaker()
|
|
| 25 |
- |
|
| 26 |
- |
|
| 27 |
-@pytest.fixture(scope='session')
|
|
| 28 |
-def engine():
|
|
| 29 |
- engine = create_engine('sqlite://', echo=True)
|
|
| 30 |
- Base.metadata.create_all(engine)
|
|
| 31 |
- return engine
|
|
| 32 |
- |
|
| 33 |
- |
|
| 34 |
-@pytest.yield_fixture
|
|
| 35 |
-def session(engine):
|
|
| 36 |
- connection = engine.connect()
|
|
| 37 |
- trans = connection.begin()
|
|
| 38 |
- session = Session(bind=connection)
|
|
| 39 |
- |
|
| 40 |
- yield session
|
|
| 41 |
- |
|
| 42 |
- session.close()
|
|
| 43 |
- trans.rollback()
|
|
| 44 |
- connection.close()
|