Skip to content

Commit aa3fb8f

Browse files
committed
[debian] swagger: remove test
1 parent 0720a83 commit aa3fb8f

4 files changed

Lines changed: 11 additions & 27 deletions

File tree

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ azurite-start:
7575
azurite-stop:
7676
@kill `cat ~/.azurite.pid`
7777

78-
swagger: swagger-install
78+
swagger: #swagger-install
7979
# Generate swagger docs
80-
@PATH=$(BINPATH)/:$(PATH) swag init --propertyStrategy pascalcase --parseDependency --parseInternal --markdownFiles docs --generalInfo docs/swagger.conf
80+
#@PATH=$(BINPATH)/:$(PATH) swag init --propertyStrategy pascalcase --parseDependency --parseInternal --markdownFiles docs --generalInfo docs/swagger.conf
8181

8282
etcd-install:
8383
# Install etcd

files/public.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ func (storage *PublishedStorage) LinkFromPool(publishedPrefix, publishedRelPath,
169169

170170
var dstStat os.FileInfo
171171

172-
dstStat, err = os.Stat(filepath.Join(poolPath, baseName))
172+
dstStat, err = os.Stat(destinationPath)
173173
if err == nil {
174174
// already exists, check source file
175175

@@ -188,7 +188,7 @@ func (storage *PublishedStorage) LinkFromPool(publishedPrefix, publishedRelPath,
188188
} else {
189189
// if source and destination have the same checksums, no need to copy
190190
var dstMD5 string
191-
dstMD5, err = utils.MD5ChecksumForFile(filepath.Join(poolPath, baseName))
191+
dstMD5, err = utils.MD5ChecksumForFile(destinationPath)
192192

193193
if err != nil {
194194
return err
@@ -219,11 +219,11 @@ func (storage *PublishedStorage) LinkFromPool(publishedPrefix, publishedRelPath,
219219

220220
// source and destination have different inodes, if !forced, this is fatal error
221221
if !force {
222-
return fmt.Errorf("error linking file to %s: file already exists and is different", filepath.Join(poolPath, baseName))
222+
return fmt.Errorf("error linking file to %s: file already exists and is different", destinationPath)
223223
}
224224

225225
// forced, so remove destination
226-
err = os.Remove(filepath.Join(poolPath, baseName))
226+
err = os.Remove(destinationPath)
227227
if err != nil {
228228
return err
229229
}
@@ -238,7 +238,7 @@ func (storage *PublishedStorage) LinkFromPool(publishedPrefix, publishedRelPath,
238238
}
239239

240240
var dst *os.File
241-
dst, err = os.Create(filepath.Join(poolPath, baseName))
241+
dst, err = os.Create(destinationPath)
242242
if err != nil {
243243
_ = r.Close()
244244
return err
@@ -266,9 +266,9 @@ func (storage *PublishedStorage) LinkFromPool(publishedPrefix, publishedRelPath,
266266

267267
err = dst.Close()
268268
} else if storage.linkMethod == LinkMethodSymLink {
269-
err = localSourcePool.Symlink(sourcePath, filepath.Join(poolPath, baseName))
269+
err = localSourcePool.Symlink(sourcePath, destinationPath)
270270
} else {
271-
err = localSourcePool.Link(sourcePath, filepath.Join(poolPath, baseName))
271+
err = localSourcePool.Link(sourcePath, destinationPath)
272272
}
273273

274274
return err

system/t02_config/CreateConfigTest_gold

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,9 @@ serve_in_api_mode: false
8383
# Enable metrics for Prometheus client
8484
enable_metrics_endpoint: false
8585

86+
# Not implemented in this version.
8687
# Enable API documentation on /docs
87-
enable_swagger_endpoint: false
88+
#enable_swagger_endpoint: false
8889

8990
# OBSOLETE: use via url param ?_async=true
9091
async_api: false

system/t12_api/docs.py

Lines changed: 0 additions & 17 deletions
This file was deleted.

0 commit comments

Comments
 (0)